diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 18:15:14 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 18:15:14 +0300 |
| commit | e155aee2b279b099da5c5cfd6df5795e7388ece1 (patch) | |
| tree | 36c4469f2e86ea0e2f12ffa54ee78bfb56ba3d06 /arch/arm/mach-at91/at91sam9g45.c | |
| parent | 81cc3f868d30884c6f2d2bf5d1861fbeb24ddebd (diff) | |
| parent | 4fdfb67f24b64844ac110622bb51b2ee0f894492 (diff) | |
| download | linux-e155aee2b279b099da5c5cfd6df5795e7388ece1.tar.xz | |
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup
Pull "Third batch of cleanup/SoC for 3.19" from Nicolas Ferre:
- fixes following legacy board removal
- removal of legacy board support for at91sam9263, at91sam9260/at91sam9g20
and at91sam9261/at91sam9g10 SoCs families. Please use DT now.
- removal of some now useless Kconfig options
* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/Kconfig: remove useless fbdev Kconfig options
ARM: at91: remove at91sam9261/at91sam9g10 legacy board support
ARM: at91/Kconfig: remove unused config options
ARM: at91: remove at91sam9260/at91sam9g20 legacy board support
ARM: at91: remove at91sam9260/at91sam9g20 legacy boards files
ARM: at91: remove at91sam9263 legacy board support
ARM: at91/at91sam9g45: remove useless header file
Conflicts:
arch/arm/mach-at91/at91sam9g45.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index dcd867143c75..b6117bea9a6f 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -12,7 +12,6 @@ #include <asm/system_misc.h> #include <asm/irq.h> -#include <mach/cpu.h> #include <mach/hardware.h> #include "soc.h" |