diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:11:31 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:11:31 -0800 |
| commit | 684852315dea655f788f6f1006a14b8ab86478fd (patch) | |
| tree | 90d7885b26b87d27ed4cdb4026e608908e8a8a4c /arch/arm/mach-at91/generic.h | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 9918ceafd4a9e013572e03983f528017c29bb1cb (diff) | |
Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into at91/base
* 'at91-3.4-base' of git://github.com/at91linux/linux-at91:
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
| -rw-r--r-- | arch/arm/mach-at91/generic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 594133451c0..7e8280e798c 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -45,7 +45,6 @@ extern void __init at91sam9261_set_console_clock(int id); extern void __init at91sam9263_set_console_clock(int id); extern void __init at91sam9rl_set_console_clock(int id); extern void __init at91sam9g45_set_console_clock(int id); -extern void __init at91cap9_set_console_clock(int id); #ifdef CONFIG_AT91_PMC_UNIT extern int __init at91_clock_init(unsigned long main_clock); #else |