diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-at91rm9200/clock.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/common.c | 11 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-at91rm9200/clock.c b/arch/arm/mach-at91rm9200/clock.c index 30042d2bac5f..fe71b834899b 100644 --- a/arch/arm/mach-at91rm9200/clock.c +++ b/arch/arm/mach-at91rm9200/clock.c | |||
@@ -28,10 +28,10 @@ | |||
28 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
29 | 29 | ||
30 | #include <asm/arch/hardware.h> | 30 | #include <asm/arch/hardware.h> |
31 | #include <asm/arch/board.h> /* for master clock global */ | ||
32 | 31 | ||
33 | #include "generic.h" | 32 | #include "generic.h" |
34 | 33 | ||
34 | |||
35 | /* | 35 | /* |
36 | * There's a lot more which can be done with clocks, including cpufreq | 36 | * There's a lot more which can be done with clocks, including cpufreq |
37 | * integration, slow clock mode support (for system suspend), letting | 37 | * integration, slow clock mode support (for system suspend), letting |
@@ -722,9 +722,6 @@ int __init at91_clock_init(unsigned long main_clock) | |||
722 | (unsigned) main_clock / 1000000, | 722 | (unsigned) main_clock / 1000000, |
723 | ((unsigned) main_clock % 1000000) / 1000); | 723 | ((unsigned) main_clock % 1000000) / 1000); |
724 | 724 | ||
725 | /* FIXME get rid of master_clock global */ | ||
726 | at91_master_clock = mck.rate_hz; | ||
727 | |||
728 | #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS | 725 | #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS |
729 | /* establish PCK0..PCK3 parentage */ | 726 | /* establish PCK0..PCK3 parentage */ |
730 | for (tmp = 0; tmp < ARRAY_SIZE(clock_list); tmp++) { | 727 | for (tmp = 0; tmp < ARRAY_SIZE(clock_list); tmp++) { |
diff --git a/arch/arm/mach-at91rm9200/common.c b/arch/arm/mach-at91rm9200/common.c index 40d29a73b5c5..1da68966e77f 100644 --- a/arch/arm/mach-at91rm9200/common.c +++ b/arch/arm/mach-at91rm9200/common.c | |||
@@ -108,14 +108,3 @@ void __init at91rm9200_map_io(void) | |||
108 | iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); | 108 | iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); |
109 | } | 109 | } |
110 | 110 | ||
111 | |||
112 | unsigned long at91_master_clock; | ||
113 | |||
114 | EXPORT_SYMBOL(at91_master_clock); | ||
115 | |||
116 | |||
117 | int at91_serial_map[AT91_NR_UART]; | ||
118 | int at91_console_port; | ||
119 | |||
120 | EXPORT_SYMBOL(at91_serial_map); | ||
121 | EXPORT_SYMBOL(at91_console_port); | ||