diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-04-28 17:44:43 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-28 17:44:43 -0400 |
commit | 2064c946eaca641d28281264d01d0c8b977f1f20 (patch) | |
tree | 4fb044fd6773560e295a45e497a32c87b05ffc0c | |
parent | 3f31b874600bcee53bac6846f72fbee5c33c8805 (diff) |
ARM: always select HAVE_IDE
It's plain wrong for PCMCIA to select HAVE_IDE that implies e.g. the
availability of an asm/ide.h
It turns out this was done for ARM, and we can simply always select
HAVE_IDE on ARM instead of manually tracking which platforms might
possible have an IDE controller directly or indirectly.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | arch/arm/Kconfig | 15 | ||||
-rw-r--r-- | drivers/pcmcia/Kconfig | 1 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d8d253285a94..b786e68914d4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration" | |||
8 | config ARM | 8 | config ARM |
9 | bool | 9 | bool |
10 | default y | 10 | default y |
11 | select HAVE_IDE | ||
11 | select RTC_LIB | 12 | select RTC_LIB |
12 | select SYS_SUPPORTS_APM_EMULATION | 13 | select SYS_SUPPORTS_APM_EMULATION |
13 | select HAVE_OPROFILE | 14 | select HAVE_OPROFILE |
@@ -223,7 +224,6 @@ config ARCH_CLPS7500 | |||
223 | select TIMER_ACORN | 224 | select TIMER_ACORN |
224 | select ISA | 225 | select ISA |
225 | select NO_IOPORT | 226 | select NO_IOPORT |
226 | select HAVE_IDE | ||
227 | help | 227 | help |
228 | Support for the Cirrus Logic PS7500FE system-on-a-chip. | 228 | Support for the Cirrus Logic PS7500FE system-on-a-chip. |
229 | 229 | ||
@@ -236,7 +236,6 @@ config ARCH_CO285 | |||
236 | bool "Co-EBSA285" | 236 | bool "Co-EBSA285" |
237 | select FOOTBRIDGE | 237 | select FOOTBRIDGE |
238 | select FOOTBRIDGE_ADDIN | 238 | select FOOTBRIDGE_ADDIN |
239 | select HAVE_IDE | ||
240 | help | 239 | help |
241 | Support for Intel's EBSA285 companion chip. | 240 | Support for Intel's EBSA285 companion chip. |
242 | 241 | ||
@@ -262,7 +261,6 @@ config ARCH_EP93XX | |||
262 | config ARCH_FOOTBRIDGE | 261 | config ARCH_FOOTBRIDGE |
263 | bool "FootBridge" | 262 | bool "FootBridge" |
264 | select FOOTBRIDGE | 263 | select FOOTBRIDGE |
265 | select HAVE_IDE | ||
266 | help | 264 | help |
267 | Support for systems based on the DC21285 companion chip | 265 | Support for systems based on the DC21285 companion chip |
268 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. | 266 | ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. |
@@ -301,7 +299,6 @@ config ARCH_IOP32X | |||
301 | depends on MMU | 299 | depends on MMU |
302 | select PLAT_IOP | 300 | select PLAT_IOP |
303 | select PCI | 301 | select PCI |
304 | select HAVE_IDE | ||
305 | help | 302 | help |
306 | Support for Intel's 80219 and IOP32X (XScale) family of | 303 | Support for Intel's 80219 and IOP32X (XScale) family of |
307 | processors. | 304 | processors. |
@@ -311,14 +308,12 @@ config ARCH_IOP33X | |||
311 | depends on MMU | 308 | depends on MMU |
312 | select PLAT_IOP | 309 | select PLAT_IOP |
313 | select PCI | 310 | select PCI |
314 | select HAVE_IDE | ||
315 | help | 311 | help |
316 | Support for Intel's IOP33X (XScale) family of processors. | 312 | Support for Intel's IOP33X (XScale) family of processors. |
317 | 313 | ||
318 | config ARCH_IXP23XX | 314 | config ARCH_IXP23XX |
319 | bool "IXP23XX-based" | 315 | bool "IXP23XX-based" |
320 | depends on MMU | 316 | depends on MMU |
321 | select HAVE_IDE | ||
322 | select PCI | 317 | select PCI |
323 | help | 318 | help |
324 | Support for Intel's IXP23xx (XScale) family of processors. | 319 | Support for Intel's IXP23xx (XScale) family of processors. |
@@ -336,14 +331,12 @@ config ARCH_IXP4XX | |||
336 | select GENERIC_GPIO | 331 | select GENERIC_GPIO |
337 | select GENERIC_TIME | 332 | select GENERIC_TIME |
338 | select GENERIC_CLOCKEVENTS | 333 | select GENERIC_CLOCKEVENTS |
339 | select HAVE_IDE | ||
340 | help | 334 | help |
341 | Support for Intel's IXP4XX (XScale) family of processors. | 335 | Support for Intel's IXP4XX (XScale) family of processors. |
342 | 336 | ||
343 | config ARCH_L7200 | 337 | config ARCH_L7200 |
344 | bool "LinkUp-L7200" | 338 | bool "LinkUp-L7200" |
345 | select FIQ | 339 | select FIQ |
346 | select HAVE_IDE | ||
347 | help | 340 | help |
348 | Say Y here if you intend to run this kernel on a LinkUp Systems | 341 | Say Y here if you intend to run this kernel on a LinkUp Systems |
349 | L7200 Software Development Board which uses an ARM720T processor. | 342 | L7200 Software Development Board which uses an ARM720T processor. |
@@ -400,7 +393,6 @@ config ARCH_PXA | |||
400 | depends on MMU | 393 | depends on MMU |
401 | select ARCH_MTD_XIP | 394 | select ARCH_MTD_XIP |
402 | select GENERIC_GPIO | 395 | select GENERIC_GPIO |
403 | select HAVE_IDE | ||
404 | select HAVE_GPIO_LIB | 396 | select HAVE_GPIO_LIB |
405 | select GENERIC_TIME | 397 | select GENERIC_TIME |
406 | select GENERIC_CLOCKEVENTS | 398 | select GENERIC_CLOCKEVENTS |
@@ -416,7 +408,6 @@ config ARCH_RPC | |||
416 | select ARCH_MAY_HAVE_PC_FDC | 408 | select ARCH_MAY_HAVE_PC_FDC |
417 | select ISA_DMA_API | 409 | select ISA_DMA_API |
418 | select NO_IOPORT | 410 | select NO_IOPORT |
419 | select HAVE_IDE | ||
420 | help | 411 | help |
421 | On the Acorn Risc-PC, Linux can support the internal IDE disk and | 412 | On the Acorn Risc-PC, Linux can support the internal IDE disk and |
422 | CD-ROM interface, serial and parallel port, and the floppy drive. | 413 | CD-ROM interface, serial and parallel port, and the floppy drive. |
@@ -432,7 +423,6 @@ config ARCH_SA1100 | |||
432 | select GENERIC_TIME | 423 | select GENERIC_TIME |
433 | select GENERIC_CLOCKEVENTS | 424 | select GENERIC_CLOCKEVENTS |
434 | select TICK_ONESHOT | 425 | select TICK_ONESHOT |
435 | select HAVE_IDE | ||
436 | select HAVE_GPIO_LIB | 426 | select HAVE_GPIO_LIB |
437 | help | 427 | help |
438 | Support for StrongARM 11x0 based boards. | 428 | Support for StrongARM 11x0 based boards. |
@@ -440,7 +430,6 @@ config ARCH_SA1100 | |||
440 | config ARCH_S3C2410 | 430 | config ARCH_S3C2410 |
441 | bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" | 431 | bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" |
442 | select GENERIC_GPIO | 432 | select GENERIC_GPIO |
443 | select HAVE_IDE | ||
444 | help | 433 | help |
445 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics | 434 | Samsung S3C2410X CPU based systems, such as the Simtec Electronics |
446 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or | 435 | BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or |
@@ -448,7 +437,6 @@ config ARCH_S3C2410 | |||
448 | 437 | ||
449 | config ARCH_SHARK | 438 | config ARCH_SHARK |
450 | bool "Shark" | 439 | bool "Shark" |
451 | select HAVE_IDE | ||
452 | select ISA | 440 | select ISA |
453 | select ISA_DMA | 441 | select ISA_DMA |
454 | select PCI | 442 | select PCI |
@@ -458,7 +446,6 @@ config ARCH_SHARK | |||
458 | 446 | ||
459 | config ARCH_LH7A40X | 447 | config ARCH_LH7A40X |
460 | bool "Sharp LH7A40X" | 448 | bool "Sharp LH7A40X" |
461 | select HAVE_IDE | ||
462 | help | 449 | help |
463 | Say Y here for systems based on one of the Sharp LH7A40X | 450 | Say Y here for systems based on one of the Sharp LH7A40X |
464 | System on a Chip processors. These CPUs include an ARM922T | 451 | System on a Chip processors. These CPUs include an ARM922T |
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 8d8852651fd2..1b0eb5aaf650 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig | |||
@@ -38,7 +38,6 @@ config PCMCIA_DEBUG | |||
38 | config PCMCIA | 38 | config PCMCIA |
39 | tristate "16-bit PCMCIA support" | 39 | tristate "16-bit PCMCIA support" |
40 | select CRC32 | 40 | select CRC32 |
41 | select HAVE_IDE | ||
42 | default y | 41 | default y |
43 | ---help--- | 42 | ---help--- |
44 | This option enables support for 16-bit PCMCIA cards. Most older | 43 | This option enables support for 16-bit PCMCIA cards. Most older |