Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 2064c946eaca641d28281264d01d0c8b977f1f20

Authored by Adrian Bunk
Committed by Bartlomiej Zolnierkiewicz
1 parent 3f31b87460
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 1 additions and 15 deletions Side-by-side Diff

... ... @@ -8,6 +8,7 @@
8 8 config ARM
9 9 bool
10 10 default y
  11 + select HAVE_IDE
11 12 select RTC_LIB
12 13 select SYS_SUPPORTS_APM_EMULATION
13 14 select HAVE_OPROFILE
... ... @@ -223,7 +224,6 @@
223 224 select TIMER_ACORN
224 225 select ISA
225 226 select NO_IOPORT
226   - select HAVE_IDE
227 227 help
228 228 Support for the Cirrus Logic PS7500FE system-on-a-chip.
229 229  
... ... @@ -236,7 +236,6 @@
236 236 bool "Co-EBSA285"
237 237 select FOOTBRIDGE
238 238 select FOOTBRIDGE_ADDIN
239   - select HAVE_IDE
240 239 help
241 240 Support for Intel's EBSA285 companion chip.
242 241  
... ... @@ -262,7 +261,6 @@
262 261 config ARCH_FOOTBRIDGE
263 262 bool "FootBridge"
264 263 select FOOTBRIDGE
265   - select HAVE_IDE
266 264 help
267 265 Support for systems based on the DC21285 companion chip
268 266 ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
... ... @@ -301,7 +299,6 @@
301 299 depends on MMU
302 300 select PLAT_IOP
303 301 select PCI
304   - select HAVE_IDE
305 302 help
306 303 Support for Intel's 80219 and IOP32X (XScale) family of
307 304 processors.
308 305  
... ... @@ -311,14 +308,12 @@
311 308 depends on MMU
312 309 select PLAT_IOP
313 310 select PCI
314   - select HAVE_IDE
315 311 help
316 312 Support for Intel's IOP33X (XScale) family of processors.
317 313  
318 314 config ARCH_IXP23XX
319 315 bool "IXP23XX-based"
320 316 depends on MMU
321   - select HAVE_IDE
322 317 select PCI
323 318 help
324 319 Support for Intel's IXP23xx (XScale) family of processors.
325 320  
... ... @@ -336,14 +331,12 @@
336 331 select GENERIC_GPIO
337 332 select GENERIC_TIME
338 333 select GENERIC_CLOCKEVENTS
339   - select HAVE_IDE
340 334 help
341 335 Support for Intel's IXP4XX (XScale) family of processors.
342 336  
343 337 config ARCH_L7200
344 338 bool "LinkUp-L7200"
345 339 select FIQ
346   - select HAVE_IDE
347 340 help
348 341 Say Y here if you intend to run this kernel on a LinkUp Systems
349 342 L7200 Software Development Board which uses an ARM720T processor.
... ... @@ -400,7 +393,6 @@
400 393 depends on MMU
401 394 select ARCH_MTD_XIP
402 395 select GENERIC_GPIO
403   - select HAVE_IDE
404 396 select HAVE_GPIO_LIB
405 397 select GENERIC_TIME
406 398 select GENERIC_CLOCKEVENTS
... ... @@ -416,7 +408,6 @@
416 408 select ARCH_MAY_HAVE_PC_FDC
417 409 select ISA_DMA_API
418 410 select NO_IOPORT
419   - select HAVE_IDE
420 411 help
421 412 On the Acorn Risc-PC, Linux can support the internal IDE disk and
422 413 CD-ROM interface, serial and parallel port, and the floppy drive.
... ... @@ -432,7 +423,6 @@
432 423 select GENERIC_TIME
433 424 select GENERIC_CLOCKEVENTS
434 425 select TICK_ONESHOT
435   - select HAVE_IDE
436 426 select HAVE_GPIO_LIB
437 427 help
438 428 Support for StrongARM 11x0 based boards.
... ... @@ -440,7 +430,6 @@
440 430 config ARCH_S3C2410
441 431 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
442 432 select GENERIC_GPIO
443   - select HAVE_IDE
444 433 help
445 434 Samsung S3C2410X CPU based systems, such as the Simtec Electronics
446 435 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
... ... @@ -448,7 +437,6 @@
448 437  
449 438 config ARCH_SHARK
450 439 bool "Shark"
451   - select HAVE_IDE
452 440 select ISA
453 441 select ISA_DMA
454 442 select PCI
... ... @@ -458,7 +446,6 @@
458 446  
459 447 config ARCH_LH7A40X
460 448 bool "Sharp LH7A40X"
461   - select HAVE_IDE
462 449 help
463 450 Say Y here for systems based on one of the Sharp LH7A40X
464 451 System on a Chip processors. These CPUs include an ARM922T
drivers/pcmcia/Kconfig
Diff comments   View file @ 2064c94
... ... @@ -38,7 +38,6 @@
38 38 config PCMCIA
39 39 tristate "16-bit PCMCIA support"
40 40 select CRC32
41   - select HAVE_IDE
42 41 default y
43 42 ---help---
44 43 This option enables support for 16-bit PCMCIA cards. Most older