diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-03-21 18:32:54 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-22 01:10:19 +0100 |
commit | 600a1dfae24746ccd8b1617742ef7b98099f83b8 (patch) | |
tree | 67eeaa58816681ed37257499bbfce23dd8db5844 /arch/arm/mach-at91/Kconfig.non_dt | |
parent | b44ce3b0f9c3883e7c537793b808feee9a2a00fb (diff) | |
parent | 9f3ba4567e8d11de89673afea174d206ca9446f6 (diff) | |
download | linux-stable-600a1dfae24746ccd8b1617742ef7b98099f83b8.tar.gz linux-stable-600a1dfae24746ccd8b1617742ef7b98099f83b8.tar.bz2 linux-stable-600a1dfae24746ccd8b1617742ef7b98099f83b8.zip |
Merge branch 'randconfig-fixes' into next/fixes-non-critical
This is the first batch of a much longer series of bug fixes
found during randconfig testing. This part are all the simple
patches that are applicable for the arm-soc tree, while most
other fixes will likely go through other maintainers.
* randconfig-fixes: (50 commits)
ARM: tegra: make debug_ll code build for ARMv6
ARM: sunxi: fix build for THUMB2_KERNEL
ARM: exynos: add missing include of linux/module.h
ARM: exynos: fix l2x0 saved regs handling
ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
ARM: samsung: select ATAGS where necessary
ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
ARM: samsung: allow serial driver to be disabled
ARM: s5pv210: enable IDE support in MACH_TORBRECK
ARM: s5p64x0: fix building with only one soc type
ARM: s3c64xx: select power domains only when used
ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
ARM: s3c24xx: osiris dvs needs tps65010
ARM: s3c24xx: fix gta02 build error
ARM: s3c24xx: MINI2440 needs I2C for EEPROM_AT24
ARM: integrator: only select pl01x if TTY is enabled
ARM: realview: fix sparsemem build
ARM: footbridge: make screen_info setup conditional
ARM: footbridge: fix build with PCI disabled
ARM: footbridge: don't build floppy code for addin mode
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/Kconfig.non_dt')
-rw-r--r-- | arch/arm/mach-at91/Kconfig.non_dt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt index 1f73e9b527da..44ace320d2e1 100644 --- a/arch/arm/mach-at91/Kconfig.non_dt +++ b/arch/arm/mach-at91/Kconfig.non_dt @@ -5,6 +5,7 @@ config HAVE_AT91_DATAFLASH_CARD choice prompt "Atmel AT91 Processor Devices for non DT boards" + depends on !ARCH_AT91X40 config ARCH_AT91_NONE bool "None" @@ -39,13 +40,6 @@ config ARCH_AT91SAM9G45 select SOC_AT91SAM9G45 select AT91_USE_OLD_CLK -config ARCH_AT91X40 - bool "AT91x40" - depends on !MMU - select ARCH_USES_GETTIMEOFFSET - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - endchoice config ARCH_AT91SAM9G20 |