diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-24 18:20:28 +0800 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 15:07:29 +0000 |
| commit | 465393749da3a3229f6067246c7e8f97f7cc833d (patch) | |
| tree | f2a8fa3d4c03fd09aed307e6d71805169c71003a /arch/arm/mach-at91/generic.h | |
| parent | 8c3583b634d5705d8f604c0d9392bc273d19c256 (diff) | |
| download | linux-stable-465393749da3a3229f6067246c7e8f97f7cc833d.tar.gz linux-stable-465393749da3a3229f6067246c7e8f97f7cc833d.tar.bz2 linux-stable-465393749da3a3229f6067246c7e8f97f7cc833d.zip | |
at91: move clock subsystem init to soc generic init
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
| -rw-r--r-- | arch/arm/mach-at91/generic.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index ce113900258e..a9d6ed4dbbc8 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -31,7 +31,6 @@ extern struct sys_timer at91sam926x_timer; extern struct sys_timer at91x40_timer; /* Clocks */ -extern int __init at91_clock_init(unsigned long main_clock); /* * function to specify the clock of the default console. As we do not * use the device/driver bus, the dev_name is not intialize. So we need @@ -44,6 +43,11 @@ 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 +static int inline at91_clock_init(unsigned long main_clock) { return 0; } +#endif struct device; /* Power Management */ |