aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-01 15:10:32 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-01 15:10:44 -0400
commitd0ee9f404f42e69e4bf4c1afd24a3b6474f61e72 (patch)
tree039afbcaa09cd3233e58fc86a7a96f9e2dda7350
parent15e0d9e37c7fe9711b60f47221c394d45553ad8c (diff)
ARM: limit CONFIG_HAVE_IDE to platforms that do
Support for IDE drivers should not be automatic, since most platforms cannot actually support any IDE low-level drivers. This partly reverts 2064c946e "ARM: always select HAVE_IDE" to set this symbol only when either a PC-style bus (PCI, ISA, PCMCIA) is enabled or a platform is used that is known to have an existing driver in drivers/ide. New platforms should not need this option and just use CONFIG_ATA with drivers/ata/. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/Kconfig6
-rw-r--r--arch/arm/plat-omap/Kconfig1
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3445f50b0b7..ed69fcde83e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -3,7 +3,7 @@ config ARM
3 default y 3 default y
4 select HAVE_AOUT 4 select HAVE_AOUT
5 select HAVE_DMA_API_DEBUG 5 select HAVE_DMA_API_DEBUG
6 select HAVE_IDE 6 select HAVE_IDE if PCI || ISA || PCMCIA
7 select HAVE_MEMBLOCK 7 select HAVE_MEMBLOCK
8 select RTC_LIB 8 select RTC_LIB
9 select SYS_SUPPORTS_APM_EMULATION 9 select SYS_SUPPORTS_APM_EMULATION
@@ -385,6 +385,7 @@ config ARCH_FOOTBRIDGE
385 select CPU_SA110 385 select CPU_SA110
386 select FOOTBRIDGE 386 select FOOTBRIDGE
387 select GENERIC_CLOCKEVENTS 387 select GENERIC_CLOCKEVENTS
388 select HAVE_IDE
388 help 389 help
389 Support for systems based on the DC21285 companion chip 390 Support for systems based on the DC21285 companion chip
390 ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. 391 ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -632,6 +633,7 @@ config ARCH_PXA
632 select AUTO_ZRELADDR 633 select AUTO_ZRELADDR
633 select MULTI_IRQ_HANDLER 634 select MULTI_IRQ_HANDLER
634 select ARM_CPU_SUSPEND if PM 635 select ARM_CPU_SUSPEND if PM
636 select HAVE_IDE
635 help 637 help
636 Support for Intel/Marvell's PXA2xx/PXA3xx processor line. 638 Support for Intel/Marvell's PXA2xx/PXA3xx processor line.
637 639
@@ -672,6 +674,7 @@ config ARCH_RPC
672 select NO_IOPORT 674 select NO_IOPORT
673 select ARCH_SPARSEMEM_ENABLE 675 select ARCH_SPARSEMEM_ENABLE
674 select ARCH_USES_GETTIMEOFFSET 676 select ARCH_USES_GETTIMEOFFSET
677 select HAVE_IDE
675 help 678 help
676 On the Acorn Risc-PC, Linux can support the internal IDE disk and 679 On the Acorn Risc-PC, Linux can support the internal IDE disk and
677 CD-ROM interface, serial and parallel port, and the floppy drive. 680 CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -690,6 +693,7 @@ config ARCH_SA1100
690 select HAVE_SCHED_CLOCK 693 select HAVE_SCHED_CLOCK
691 select TICK_ONESHOT 694 select TICK_ONESHOT
692 select ARCH_REQUIRE_GPIOLIB 695 select ARCH_REQUIRE_GPIOLIB
696 select HAVE_IDE
693 help 697 help
694 Support for StrongARM 11x0 based boards. 698 Support for StrongARM 11x0 based boards.
695 699
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index bb8f4a6b3e3..5b605a9eb09 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -14,6 +14,7 @@ config ARCH_OMAP1
14 select CLKDEV_LOOKUP 14 select CLKDEV_LOOKUP
15 select CLKSRC_MMIO 15 select CLKSRC_MMIO
16 select GENERIC_IRQ_CHIP 16 select GENERIC_IRQ_CHIP
17 select HAVE_IDE
17 help 18 help
18 "Systems based on omap7xx, omap15xx or omap16xx" 19 "Systems based on omap7xx, omap15xx or omap16xx"
19 20