diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 15:35:36 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 15:35:36 +0300 |
commit | 2c0b50fcbaffe487f741a3b6156eb6d47772b7ce (patch) | |
tree | 84bf0a4f7db9d259720624099fe16d8ef652eec1 /arch/arm/configs | |
parent | 86dd04a22a9880a9f790473d535f77edee5f621f (diff) | |
parent | f0a0a58e6f46c2dded813ee860b9cbd795b4e571 (diff) | |
download | linux-2c0b50fcbaffe487f741a3b6156eb6d47772b7ce.tar.xz |
Merge tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup
Pull "Second batch of cleanup/SoC for 3.19" from Nicolas Ferre:
- fixes following legacy board removal
- removal of an unused config option CONFIG_MACH_SAMA5_DT
- move of some header files out of include/mach directory
* tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: move sdramc/ddrsdr header to include/soc/at91
ARM: at91: remove CONFIG_MACH_SAMA5_DT
ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option
ARM: at91: remove useless init_time for DT-only SoCs
ARM: at91: fix build breakage due to legacy board removals
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/sama5_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index c9089c927daf..299ca18bbd75 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -20,7 +20,6 @@ CONFIG_ARCH_AT91=y CONFIG_SOC_SAM_V7=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y -CONFIG_MACH_SAMA5_DT=y CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0 |