diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 19:11:03 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 19:11:03 +0100 |
| commit | ef1dfa7332e9205b532da1c2d286757ce511cd1d (patch) | |
| tree | 0b079f2308c90878eaf14e8889fd3e7241aa29b8 /arch/arm/mach-at91/board-dt-rm9200.c | |
| parent | Merge tag 'zynq-cleanup-for-3.19' of https://github.com/Xilinx/linux-xlnx int... (diff) | |
| parent | ARM: at91: remove unused board.h file (diff) | |
| download | linux-ef1dfa7332e9205b532da1c2d286757ce511cd1d.tar.xz linux-ef1dfa7332e9205b532da1c2d286757ce511cd1d.zip | |
Merge tag 'at91-cleanup5' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup
Pull "Fifth batch of cleanup/SoC for 3.19" from Nicolas Ferre:
- removal of now dead code and AT91-specific driver
- removal of !DT initialization in some core AT91 drivers
- simplification of Kconfig DT board file selection: now automatic
* tag 'at91-cleanup5' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: remove unused board.h file
ARM: at91: remove unneeded header files
ARM: at91/clocksource: remove !DT PIT initializations
ARM: at91: at91rm9200 ST initialization is now DT only
ARM: at91: remove old AT91-specific drivers
ARM: at91: cleanup initilisation code by removing dead code
ARM: at91/Kconfig: select board files automatically
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-dt-rm9200.c')
| -rw-r--r-- | arch/arm/mach-at91/board-dt-rm9200.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c index feeb1a0f258e..76dfe8f9af50 100644 --- a/arch/arm/mach-at91/board-dt-rm9200.c +++ b/arch/arm/mach-at91/board-dt-rm9200.c @@ -26,9 +26,7 @@ static void __init at91rm9200_dt_timer_init(void) { -#if defined(CONFIG_COMMON_CLK) of_clk_init(NULL); -#endif at91rm9200_timer_init(); } |