diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:27:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:29:20 +0100 |
| commit | 5db45002576f7d60c5bf7b23e277845cd3e806be (patch) | |
| tree | 18cf276c8c0d64c5011784b814db586c0d5476cb /arch/arm/mach-at91/board-dt-sam9.c | |
| parent | Merge branch 'brcm/stb-smp-uart' into next/drivers (diff) | |
| parent | ARM: at91: remove unused board.h file (diff) | |
| download | linux-dev-5db45002576f7d60c5bf7b23e277845cd3e806be.tar.xz linux-dev-5db45002576f7d60c5bf7b23e277845cd3e806be.zip | |
Merge branch 'at91/cleanup5' into next/drivers
The at91 cleanups changed a lot of files, this merges in the
latest cleanups to resolve the conflicts
Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/clock.c
arch/arm/mach-at91/clock.h
drivers/rtc/Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-dt-sam9.c')
| -rw-r--r-- | arch/arm/mach-at91/board-dt-sam9.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index d3048ccdc41f..f99246aa9b38 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c @@ -21,8 +21,6 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" -#include "board.h" #include "generic.h" static const char *at91_dt_board_compat[] __initdata = { |