diff options
author | Hartley Sweeten <hartleys@visionengravers.com> | 2010-05-17 12:18:10 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:21:16 -0400 |
commit | 98830bc9967b18d6f9a614a1f354f5580196ef85 (patch) | |
tree | 39a09975fc8d4151ed48296fa58ffe2a3586a371 /arch | |
parent | c39e52a793f5599582dbacf4d8f62634a492f79e (diff) |
ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO
The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which
in turn will select GENERIC_GPIO. Because of this, there is no
reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the
architectures that have ARCH_REQUIRE_GPIOLIB.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index daaa4b2b46e1..9e938a79a3b2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -296,7 +296,6 @@ config ARCH_VEXPRESS | |||
296 | 296 | ||
297 | config ARCH_AT91 | 297 | config ARCH_AT91 |
298 | bool "Atmel AT91" | 298 | bool "Atmel AT91" |
299 | select GENERIC_GPIO | ||
300 | select ARCH_REQUIRE_GPIOLIB | 299 | select ARCH_REQUIRE_GPIOLIB |
301 | select HAVE_CLK | 300 | select HAVE_CLK |
302 | select ARCH_USES_GETTIMEOFFSET | 301 | select ARCH_USES_GETTIMEOFFSET |
@@ -326,7 +325,6 @@ config ARCH_CLPS711X | |||
326 | config ARCH_GEMINI | 325 | config ARCH_GEMINI |
327 | bool "Cortina Systems Gemini" | 326 | bool "Cortina Systems Gemini" |
328 | select CPU_FA526 | 327 | select CPU_FA526 |
329 | select GENERIC_GPIO | ||
330 | select ARCH_REQUIRE_GPIOLIB | 328 | select ARCH_REQUIRE_GPIOLIB |
331 | select ARCH_USES_GETTIMEOFFSET | 329 | select ARCH_USES_GETTIMEOFFSET |
332 | help | 330 | help |
@@ -349,7 +347,6 @@ config ARCH_EP93XX | |||
349 | select CPU_ARM920T | 347 | select CPU_ARM920T |
350 | select ARM_AMBA | 348 | select ARM_AMBA |
351 | select ARM_VIC | 349 | select ARM_VIC |
352 | select GENERIC_GPIO | ||
353 | select COMMON_CLKDEV | 350 | select COMMON_CLKDEV |
354 | select ARCH_REQUIRE_GPIOLIB | 351 | select ARCH_REQUIRE_GPIOLIB |
355 | select ARCH_HAS_HOLES_MEMORYMODEL | 352 | select ARCH_HAS_HOLES_MEMORYMODEL |
@@ -382,7 +379,6 @@ config ARCH_STMP3XXX | |||
382 | select ARCH_REQUIRE_GPIOLIB | 379 | select ARCH_REQUIRE_GPIOLIB |
383 | select GENERIC_TIME | 380 | select GENERIC_TIME |
384 | select GENERIC_CLOCKEVENTS | 381 | select GENERIC_CLOCKEVENTS |
385 | select GENERIC_GPIO | ||
386 | select USB_ARCH_HAS_EHCI | 382 | select USB_ARCH_HAS_EHCI |
387 | help | 383 | help |
388 | Support for systems based on the Freescale 3xxx CPUs. | 384 | Support for systems based on the Freescale 3xxx CPUs. |
@@ -421,7 +417,6 @@ config ARCH_IOP32X | |||
421 | select CPU_XSCALE | 417 | select CPU_XSCALE |
422 | select PLAT_IOP | 418 | select PLAT_IOP |
423 | select PCI | 419 | select PCI |
424 | select GENERIC_GPIO | ||
425 | select ARCH_REQUIRE_GPIOLIB | 420 | select ARCH_REQUIRE_GPIOLIB |
426 | help | 421 | help |
427 | Support for Intel's 80219 and IOP32X (XScale) family of | 422 | Support for Intel's 80219 and IOP32X (XScale) family of |
@@ -433,7 +428,6 @@ config ARCH_IOP33X | |||
433 | select CPU_XSCALE | 428 | select CPU_XSCALE |
434 | select PLAT_IOP | 429 | select PLAT_IOP |
435 | select PCI | 430 | select PCI |
436 | select GENERIC_GPIO | ||
437 | select ARCH_REQUIRE_GPIOLIB | 431 | select ARCH_REQUIRE_GPIOLIB |
438 | help | 432 | help |
439 | Support for Intel's IOP33X (XScale) family of processors. | 433 | Support for Intel's IOP33X (XScale) family of processors. |
@@ -485,7 +479,6 @@ config ARCH_L7200 | |||
485 | config ARCH_DOVE | 479 | config ARCH_DOVE |
486 | bool "Marvell Dove" | 480 | bool "Marvell Dove" |
487 | select PCI | 481 | select PCI |
488 | select GENERIC_GPIO | ||
489 | select ARCH_REQUIRE_GPIOLIB | 482 | select ARCH_REQUIRE_GPIOLIB |
490 | select GENERIC_TIME | 483 | select GENERIC_TIME |
491 | select GENERIC_CLOCKEVENTS | 484 | select GENERIC_CLOCKEVENTS |
@@ -497,7 +490,6 @@ config ARCH_KIRKWOOD | |||
497 | bool "Marvell Kirkwood" | 490 | bool "Marvell Kirkwood" |
498 | select CPU_FEROCEON | 491 | select CPU_FEROCEON |
499 | select PCI | 492 | select PCI |
500 | select GENERIC_GPIO | ||
501 | select ARCH_REQUIRE_GPIOLIB | 493 | select ARCH_REQUIRE_GPIOLIB |
502 | select GENERIC_TIME | 494 | select GENERIC_TIME |
503 | select GENERIC_CLOCKEVENTS | 495 | select GENERIC_CLOCKEVENTS |
@@ -519,7 +511,6 @@ config ARCH_MV78XX0 | |||
519 | bool "Marvell MV78xx0" | 511 | bool "Marvell MV78xx0" |
520 | select CPU_FEROCEON | 512 | select CPU_FEROCEON |
521 | select PCI | 513 | select PCI |
522 | select GENERIC_GPIO | ||
523 | select ARCH_REQUIRE_GPIOLIB | 514 | select ARCH_REQUIRE_GPIOLIB |
524 | select GENERIC_TIME | 515 | select GENERIC_TIME |
525 | select GENERIC_CLOCKEVENTS | 516 | select GENERIC_CLOCKEVENTS |
@@ -533,7 +524,6 @@ config ARCH_ORION5X | |||
533 | depends on MMU | 524 | depends on MMU |
534 | select CPU_FEROCEON | 525 | select CPU_FEROCEON |
535 | select PCI | 526 | select PCI |
536 | select GENERIC_GPIO | ||
537 | select ARCH_REQUIRE_GPIOLIB | 527 | select ARCH_REQUIRE_GPIOLIB |
538 | select GENERIC_TIME | 528 | select GENERIC_TIME |
539 | select GENERIC_CLOCKEVENTS | 529 | select GENERIC_CLOCKEVENTS |
@@ -546,7 +536,6 @@ config ARCH_ORION5X | |||
546 | config ARCH_MMP | 536 | config ARCH_MMP |
547 | bool "Marvell PXA168/910/MMP2" | 537 | bool "Marvell PXA168/910/MMP2" |
548 | depends on MMU | 538 | depends on MMU |
549 | select GENERIC_GPIO | ||
550 | select ARCH_REQUIRE_GPIOLIB | 539 | select ARCH_REQUIRE_GPIOLIB |
551 | select COMMON_CLKDEV | 540 | select COMMON_CLKDEV |
552 | select GENERIC_TIME | 541 | select GENERIC_TIME |
@@ -559,8 +548,7 @@ config ARCH_MMP | |||
559 | config ARCH_KS8695 | 548 | config ARCH_KS8695 |
560 | bool "Micrel/Kendin KS8695" | 549 | bool "Micrel/Kendin KS8695" |
561 | select CPU_ARM922T | 550 | select CPU_ARM922T |
562 | select GENERIC_GPIO | 551 | select ARCH_REQUIRE_GPIOLIB |
563 | select ARCH_REQUIRE_GPIOLIB | ||
564 | select ARCH_USES_GETTIMEOFFSET | 552 | select ARCH_USES_GETTIMEOFFSET |
565 | help | 553 | help |
566 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based | 554 | Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based |
@@ -583,7 +571,6 @@ config ARCH_W90X900 | |||
583 | bool "Nuvoton W90X900 CPU" | 571 | bool "Nuvoton W90X900 CPU" |
584 | select CPU_ARM926T | 572 | select CPU_ARM926T |
585 | select ARCH_REQUIRE_GPIOLIB | 573 | select ARCH_REQUIRE_GPIOLIB |
586 | select GENERIC_GPIO | ||
587 | select COMMON_CLKDEV | 574 | select COMMON_CLKDEV |
588 | select GENERIC_TIME | 575 | select GENERIC_TIME |
589 | select GENERIC_CLOCKEVENTS | 576 | select GENERIC_CLOCKEVENTS |
@@ -617,7 +604,6 @@ config ARCH_PXA | |||
617 | depends on MMU | 604 | depends on MMU |
618 | select ARCH_MTD_XIP | 605 | select ARCH_MTD_XIP |
619 | select ARCH_HAS_CPUFREQ | 606 | select ARCH_HAS_CPUFREQ |
620 | select GENERIC_GPIO | ||
621 | select COMMON_CLKDEV | 607 | select COMMON_CLKDEV |
622 | select ARCH_REQUIRE_GPIOLIB | 608 | select ARCH_REQUIRE_GPIOLIB |
623 | select GENERIC_TIME | 609 | select GENERIC_TIME |
@@ -666,7 +652,6 @@ config ARCH_SA1100 | |||
666 | select ARCH_MTD_XIP | 652 | select ARCH_MTD_XIP |
667 | select ARCH_HAS_CPUFREQ | 653 | select ARCH_HAS_CPUFREQ |
668 | select CPU_FREQ | 654 | select CPU_FREQ |
669 | select GENERIC_GPIO | ||
670 | select GENERIC_TIME | 655 | select GENERIC_TIME |
671 | select GENERIC_CLOCKEVENTS | 656 | select GENERIC_CLOCKEVENTS |
672 | select HAVE_CLK | 657 | select HAVE_CLK |
@@ -690,7 +675,6 @@ config ARCH_S3C64XX | |||
690 | bool "Samsung S3C64XX" | 675 | bool "Samsung S3C64XX" |
691 | select PLAT_SAMSUNG | 676 | select PLAT_SAMSUNG |
692 | select CPU_V6 | 677 | select CPU_V6 |
693 | select GENERIC_GPIO | ||
694 | select ARM_VIC | 678 | select ARM_VIC |
695 | select HAVE_CLK | 679 | select HAVE_CLK |
696 | select NO_IOPORT | 680 | select NO_IOPORT |
@@ -801,7 +785,6 @@ config ARCH_NOMADIK | |||
801 | select COMMON_CLKDEV | 785 | select COMMON_CLKDEV |
802 | select GENERIC_TIME | 786 | select GENERIC_TIME |
803 | select GENERIC_CLOCKEVENTS | 787 | select GENERIC_CLOCKEVENTS |
804 | select GENERIC_GPIO | ||
805 | select ARCH_REQUIRE_GPIOLIB | 788 | select ARCH_REQUIRE_GPIOLIB |
806 | help | 789 | help |
807 | Support for the Nomadik platform by ST-Ericsson | 790 | Support for the Nomadik platform by ST-Ericsson |
@@ -811,7 +794,6 @@ config ARCH_DAVINCI | |||
811 | select CPU_ARM926T | 794 | select CPU_ARM926T |
812 | select GENERIC_TIME | 795 | select GENERIC_TIME |
813 | select GENERIC_CLOCKEVENTS | 796 | select GENERIC_CLOCKEVENTS |
814 | select GENERIC_GPIO | ||
815 | select ARCH_REQUIRE_GPIOLIB | 797 | select ARCH_REQUIRE_GPIOLIB |
816 | select ZONE_DMA | 798 | select ZONE_DMA |
817 | select HAVE_IDE | 799 | select HAVE_IDE |
@@ -823,7 +805,6 @@ config ARCH_DAVINCI | |||
823 | 805 | ||
824 | config ARCH_OMAP | 806 | config ARCH_OMAP |
825 | bool "TI OMAP" | 807 | bool "TI OMAP" |
826 | select GENERIC_GPIO | ||
827 | select HAVE_CLK | 808 | select HAVE_CLK |
828 | select ARCH_REQUIRE_GPIOLIB | 809 | select ARCH_REQUIRE_GPIOLIB |
829 | select ARCH_HAS_CPUFREQ | 810 | select ARCH_HAS_CPUFREQ |
@@ -839,7 +820,6 @@ config PLAT_SPEAR | |||
839 | select ARCH_REQUIRE_GPIOLIB | 820 | select ARCH_REQUIRE_GPIOLIB |
840 | select COMMON_CLKDEV | 821 | select COMMON_CLKDEV |
841 | select GENERIC_CLOCKEVENTS | 822 | select GENERIC_CLOCKEVENTS |
842 | select GENERIC_GPIO | ||
843 | select GENERIC_TIME | 823 | select GENERIC_TIME |
844 | select HAVE_CLK | 824 | select HAVE_CLK |
845 | help | 825 | help |