ide: introduce HAVE_IDE

To allow flexible configuration of IDE introduce HAVE_IDE.
All archs except arm, um and s390 unconditionally select it.
For arm the actual configuration determine if IDE is supported.

This is a step towards introducing drivers/Kconfig for arm.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5b7dcd5a0e75b663e709b093bc2f4f21fb3d49b8..002703b8c0b033d72eea6297b869796f772c2c6e 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -5,6 +5,7 @@
 config ALPHA
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
        help
          The Alpha is a 64-bit general-purpose processor designed and

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4127af93c5f373fdf31e81f4d748bf60decc514a..9619c43783ffd333ad8346aa6e9b85f0de750d7e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -222,6 +222,7 @@ config ARCH_CLPS7500
        select TIMER_ACORN
        select ISA
        select NO_IOPORT
+       select HAVE_IDE
        help
          Support for the Cirrus Logic PS7500FE system-on-a-chip.
 
@@ -234,6 +235,7 @@ config ARCH_CO285
        bool "Co-EBSA285"
        select FOOTBRIDGE
        select FOOTBRIDGE_ADDIN
+       select HAVE_IDE
        help
          Support for Intel's EBSA285 companion chip.
 
@@ -258,6 +260,7 @@ config ARCH_EP93XX
 config ARCH_FOOTBRIDGE
        bool "FootBridge"
        select FOOTBRIDGE
+       select HAVE_IDE
        help
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -296,6 +299,7 @@ config ARCH_IOP32X
        depends on MMU
        select PLAT_IOP
        select PCI
+       select HAVE_IDE
        help
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.
@@ -305,12 +309,14 @@ config ARCH_IOP33X
        depends on MMU
        select PLAT_IOP
        select PCI
+       select HAVE_IDE
        help
          Support for Intel's IOP33X (XScale) family of processors.
 
 config ARCH_IXP23XX
        bool "IXP23XX-based"
        depends on MMU
+       select HAVE_IDE
        select PCI
        help
          Support for Intel's IXP23xx (XScale) family of processors.
@@ -328,12 +334,14 @@ config ARCH_IXP4XX
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
+       select HAVE_IDE
        help
          Support for Intel's IXP4XX (XScale) family of processors.
 
 config ARCH_L7200
        bool "LinkUp-L7200"
        select FIQ
+       select HAVE_IDE
        help
          Say Y here if you intend to run this kernel on a LinkUp Systems
          L7200 Software Development Board which uses an ARM720T processor.
@@ -388,6 +396,7 @@ config ARCH_PXA
        depends on MMU
        select ARCH_MTD_XIP
        select GENERIC_GPIO
+       select HAVE_IDE
        select HAVE_GPIO_LIB
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@ -403,6 +412,7 @@ config ARCH_RPC
        select ARCH_MAY_HAVE_PC_FDC
        select ISA_DMA_API
        select NO_IOPORT
+       select HAVE_IDE
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -414,12 +424,14 @@ config ARCH_SA1100
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select GENERIC_TIME
+       select HAVE_IDE
        help
          Support for StrongARM 11x0 based boards.
 
 config ARCH_S3C2410
        bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
        select GENERIC_GPIO
+       select HAVE_IDE
        help
          Samsung S3C2410X CPU based systems, such as the Simtec Electronics
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -427,6 +439,7 @@ config ARCH_S3C2410
 
 config ARCH_SHARK
        bool "Shark"
+       select HAVE_IDE
        select ISA
        select ISA_DMA
        select PCI
@@ -436,6 +449,7 @@ config ARCH_SHARK
 
 config ARCH_LH7A40X
        bool "Sharp LH7A40X"
+       select HAVE_IDE
        help
          Say Y here for systems based on one of the Sharp LH7A40X
          System on a Chip processors.  These CPUs include an ARM922T
@@ -1093,12 +1107,7 @@ source "drivers/block/Kconfig"
 
 source "drivers/misc/Kconfig"
 
-if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
-       || ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
-       || ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
-       || ARCH_IXP23XX
 source "drivers/ide/Kconfig"
-endif
 
 source "drivers/scsi/Kconfig"
 

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 28e0caf4156ca68bb066d8300fd1947264e28037..c75d7089f982bba957ced3680d4d2bf9b52f56d3 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -10,6 +10,7 @@ config AVR32
        # With EMBEDDED=n, we get lots of stuff automatically selected
        # that we usually don't need on AVR32.
        select EMBEDDED
+       select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
        help

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 368bc7fe167e70c1400b38e30188dda6b87baa00..589c6aca4803c83c1ac02f9d08735ca15510baca 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -24,6 +24,7 @@ config RWSEM_XCHGADD_ALGORITHM
 config BLACKFIN
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
 
 config ZONE_DMA

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 8456bc8efb7c6b2ce3fa1107189b8e4ff92923fd..9389d38f222f2f749497b106872278a7da5bdd0b 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -54,6 +54,7 @@ config FORCE_MAX_ZONEORDER
 config CRIS
        bool
        default y
+       select HAVE_IDE
 
 config HZ
        int

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 9e561ede0925b6928bb44907c1bcde6ee4139d43..a5aac1b075628b8a30004d52bb73d2e1ce7d978f 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,6 +5,7 @@
 config FRV
        bool
        default y
+       select HAVE_IDE
 
 config ZONE_DMA
        bool

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index f69e5ea385588d0c554fe5f0d3ca2ff82f8c2138..085dc6ec152b057b6da23c2742a39d0a0012c327 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -8,6 +8,7 @@ mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
 config H8300
        bool
        default y
+       select HAVE_IDE
 
 config MMU
        bool

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index b0de1132dfc02e0537c381b66be30d507daee2f5..2d4fcd01bc913a1103431516e3204827b331e886 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -15,6 +15,7 @@ config IA64
        select ACPI if (!IA64_HP_SIM)
        select PM if (!IA64_HP_SIM)
        select ARCH_SUPPORTS_MSI
+       select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
        default y

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index d4679ab55b969c3fe8bfc4f88dfef02d618e1877..de153de2ea9f34df702bcbd7c915ee119e9bac53 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux/M32R Kernel Configuration"
 config M32R
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
 
 config SBUS

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 2b0ed89cd173728ddda8ad3ea201977c5ee0484c..65db2261b9ea5baa94d87a2042d690200cdcb874 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -5,6 +5,7 @@
 config M68K
        bool
        default y
+       select HAVE_IDE
 
 config MMU
        bool

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 548a7b321633c670b358f190e2a92a54a694ba45..07eb4c4bab8243723ead643a13d6f5611a42d032 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -8,6 +8,7 @@ mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
 config M68K
        bool
        default y
+       select HAVE_IDE
 
 config MMU
        bool

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ec78a5762e9ec3be6a23630413c4f81a5f6b0fe9..ade230d445d9fd1ed952bc191720e60c679d9073 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,6 +1,7 @@
 config MIPS
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index d929ac84f25a1fcd5a636249d24c5921508d483d..bc7a19da6245d89349cf4c532cc8233623a217de 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -7,6 +7,7 @@ mainmenu "Linux/PA-RISC Kernel Configuration"
 
 config PARISC
        def_bool y
+       select HAVE_IDE
        select HAVE_OPROFILE
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 26b963c33c88d0e9dd64e336a5c72336e8195c73..485513c9f1af4c4f4f0aa91ad6d29f0ccb363c1c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -87,6 +87,7 @@ config ARCH_NO_VIRT_TO_BUS
 config PPC
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
 

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 531156f8919ca5e4877f1835a14a303a232496ae..abc877faf1232eb73cc284d6737e8ef356bef308 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -42,6 +42,7 @@ config GENERIC_CALIBRATE_DELAY
 config PPC
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 6e035d1cf7895663f5c51eed1b4167f16dd1d759..d87d4bf88803815ffcb812afe36edcc258cc8cb4 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configuration"
 config SUPERH
        def_bool y
        select EMBEDDED
+       select HAVE_IDE
        select HAVE_OPROFILE
        help
          The SuperH is a RISC processor targeted for use in embedded systems

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 7c674a3503b66c8aa2ced1896bc3df6e2a6e7999..c40343c5492085c203bbb553d113a970ec65c918 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -69,6 +69,7 @@ config NR_CPUS
 config SPARC
        bool
        default y
+       select HAVE_IDE
        select HAVE_OPROFILE
 
 # Identify this as a Sparc32 build

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index b810f2b7526a605b1f783c021190bc8304c7ac0f..810755637311c425751f55e7726089d8bd3ff7db 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -14,6 +14,7 @@ config SPARC
 config SPARC64
        bool
        default y
+       select HAVE_IDE
        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 7b6d3716efca4a0f370ef848ac8cecbfa0e39eb6..4379f43505efafe27f1c50dca47b970f3fdad3df 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -78,6 +78,7 @@ config MCA
 config V850
        bool
        default y
+       select HAVE_IDE
 
 menu "Processor type and features"
 

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 65a70b777c12e149d14c95a9775896abbe720964..3bd42dadbc4d212da284123dc9e641c4548f5072 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -18,6 +18,7 @@ config X86_64
 ### Arch settings
 config X86
        def_bool y
+       select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
 

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index fd36764d7fb72358a65a3551ad9a0faf7b4a70e1..9fc8551a1cf685c53fce6564a004d40642bf3acc 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -14,6 +14,7 @@ config ZONE_DMA
 config XTENSA
        bool
        default y
+       select HAVE_IDE
        help
          Xtensa processors are 32-bit RISC machines designed by Tensilica
          primarily for embedded systems.  These processors are both

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index ab8fb257528ed51cb4e9bac0abb0710ce7543fbb..043c34ad0a05fee2659972d8e66ba41dcf9277b0 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -4,10 +4,14 @@
 # Andre Hedrick <andre@linux-ide.org>
 #
 
+# Select HAVE_IDE if IDE is supported
+config HAVE_IDE
+       def_bool n
+
 menuconfig IDE
        tristate "ATA/ATAPI/MFM/RLL support"
+       depends on HAVE_IDE
        depends on BLOCK
-       depends on HAS_IOMEM
        ---help---
          If you say Y here, your kernel will be able to manage low cost mass
          storage units such as ATA/(E)IDE and ATAPI units. The most common

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 519b4ff79f7f9edd073ef829ed1cb3f17be2aa5c..8b22281b087f6964c9a13a013efa037458a25be8 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -38,6 +38,7 @@ config PCMCIA_DEBUG
 config PCMCIA
        tristate "16-bit PCMCIA support"
        select CRC32
+       select HAVE_IDE
        default y
        ---help---
           This option enables support for 16-bit PCMCIA cards. Most older