aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-18 03:17:56 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-18 03:17:56 -0400
commit717e7c2672e37253a4d3aa70e4716b5b0a658761 (patch)
tree9e4ce198c6c74dfedd20671188277ddd582989fc /arch/arm
parentac1d426e825ab5778995f2f6f053ca2e6b45c622 (diff)
ARM: remove 'select GENERIC_TIME'
GENERIC_TIME is now enabled by default, so 'select GENERIC_TIME' is redundant. Remove them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig28
-rw-r--r--arch/arm/mach-at91/Kconfig10
-rw-r--r--arch/arm/mach-shmobile/Kconfig3
3 files changed, 0 insertions, 41 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 492f81344900..a07b6c47a6b8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -225,7 +225,6 @@ config ARCH_INTEGRATOR
225 select ARCH_HAS_CPUFREQ 225 select ARCH_HAS_CPUFREQ
226 select COMMON_CLKDEV 226 select COMMON_CLKDEV
227 select ICST 227 select ICST
228 select GENERIC_TIME
229 select GENERIC_CLOCKEVENTS 228 select GENERIC_CLOCKEVENTS
230 select PLAT_VERSATILE 229 select PLAT_VERSATILE
231 help 230 help
@@ -236,7 +235,6 @@ config ARCH_REALVIEW
236 select ARM_AMBA 235 select ARM_AMBA
237 select COMMON_CLKDEV 236 select COMMON_CLKDEV
238 select ICST 237 select ICST
239 select GENERIC_TIME
240 select GENERIC_CLOCKEVENTS 238 select GENERIC_CLOCKEVENTS
241 select ARCH_WANT_OPTIONAL_GPIOLIB 239 select ARCH_WANT_OPTIONAL_GPIOLIB
242 select PLAT_VERSATILE 240 select PLAT_VERSATILE
@@ -251,7 +249,6 @@ config ARCH_VERSATILE
251 select ARM_VIC 249 select ARM_VIC
252 select COMMON_CLKDEV 250 select COMMON_CLKDEV
253 select ICST 251 select ICST
254 select GENERIC_TIME
255 select GENERIC_CLOCKEVENTS 252 select GENERIC_CLOCKEVENTS
256 select ARCH_WANT_OPTIONAL_GPIOLIB 253 select ARCH_WANT_OPTIONAL_GPIOLIB
257 select PLAT_VERSATILE 254 select PLAT_VERSATILE
@@ -266,7 +263,6 @@ config ARCH_VEXPRESS
266 select ARM_TIMER_SP804 263 select ARM_TIMER_SP804
267 select COMMON_CLKDEV 264 select COMMON_CLKDEV
268 select GENERIC_CLOCKEVENTS 265 select GENERIC_CLOCKEVENTS
269 select GENERIC_TIME
270 select HAVE_CLK 266 select HAVE_CLK
271 select ICST 267 select ICST
272 select PLAT_VERSATILE 268 select PLAT_VERSATILE
@@ -288,7 +284,6 @@ config ARCH_BCMRING
288 select CPU_V6 284 select CPU_V6
289 select ARM_AMBA 285 select ARM_AMBA
290 select COMMON_CLKDEV 286 select COMMON_CLKDEV
291 select GENERIC_TIME
292 select GENERIC_CLOCKEVENTS 287 select GENERIC_CLOCKEVENTS
293 select ARCH_WANT_OPTIONAL_GPIOLIB 288 select ARCH_WANT_OPTIONAL_GPIOLIB
294 help 289 help
@@ -304,7 +299,6 @@ config ARCH_CLPS711X
304config ARCH_CNS3XXX 299config ARCH_CNS3XXX
305 bool "Cavium Networks CNS3XXX family" 300 bool "Cavium Networks CNS3XXX family"
306 select CPU_V6 301 select CPU_V6
307 select GENERIC_TIME
308 select GENERIC_CLOCKEVENTS 302 select GENERIC_CLOCKEVENTS
309 select ARM_GIC 303 select ARM_GIC
310 help 304 help
@@ -353,7 +347,6 @@ config ARCH_FOOTBRIDGE
353 347
354config ARCH_MXC 348config ARCH_MXC
355 bool "Freescale MXC/iMX-based" 349 bool "Freescale MXC/iMX-based"
356 select GENERIC_TIME
357 select GENERIC_CLOCKEVENTS 350 select GENERIC_CLOCKEVENTS
358 select ARCH_REQUIRE_GPIOLIB 351 select ARCH_REQUIRE_GPIOLIB
359 select COMMON_CLKDEV 352 select COMMON_CLKDEV
@@ -365,7 +358,6 @@ config ARCH_STMP3XXX
365 select CPU_ARM926T 358 select CPU_ARM926T
366 select COMMON_CLKDEV 359 select COMMON_CLKDEV
367 select ARCH_REQUIRE_GPIOLIB 360 select ARCH_REQUIRE_GPIOLIB
368 select GENERIC_TIME
369 select GENERIC_CLOCKEVENTS 361 select GENERIC_CLOCKEVENTS
370 select USB_ARCH_HAS_EHCI 362 select USB_ARCH_HAS_EHCI
371 help 363 help
@@ -376,7 +368,6 @@ config ARCH_NETX
376 select CPU_ARM926T 368 select CPU_ARM926T
377 select ARM_VIC 369 select ARM_VIC
378 select GENERIC_CLOCKEVENTS 370 select GENERIC_CLOCKEVENTS
379 select GENERIC_TIME
380 help 371 help
381 This enables support for systems based on the Hilscher NetX Soc 372 This enables support for systems based on the Hilscher NetX Soc
382 373
@@ -443,7 +434,6 @@ config ARCH_IXP4XX
443 depends on MMU 434 depends on MMU
444 select CPU_XSCALE 435 select CPU_XSCALE
445 select GENERIC_GPIO 436 select GENERIC_GPIO
446 select GENERIC_TIME
447 select GENERIC_CLOCKEVENTS 437 select GENERIC_CLOCKEVENTS
448 select DMABOUNCE if PCI 438 select DMABOUNCE if PCI
449 help 439 help
@@ -468,7 +458,6 @@ config ARCH_DOVE
468 bool "Marvell Dove" 458 bool "Marvell Dove"
469 select PCI 459 select PCI
470 select ARCH_REQUIRE_GPIOLIB 460 select ARCH_REQUIRE_GPIOLIB
471 select GENERIC_TIME
472 select GENERIC_CLOCKEVENTS 461 select GENERIC_CLOCKEVENTS
473 select PLAT_ORION 462 select PLAT_ORION
474 help 463 help
@@ -479,7 +468,6 @@ config ARCH_KIRKWOOD
479 select CPU_FEROCEON 468 select CPU_FEROCEON
480 select PCI 469 select PCI
481 select ARCH_REQUIRE_GPIOLIB 470 select ARCH_REQUIRE_GPIOLIB
482 select GENERIC_TIME
483 select GENERIC_CLOCKEVENTS 471 select GENERIC_CLOCKEVENTS
484 select PLAT_ORION 472 select PLAT_ORION
485 help 473 help
@@ -489,7 +477,6 @@ config ARCH_KIRKWOOD
489config ARCH_LOKI 477config ARCH_LOKI
490 bool "Marvell Loki (88RC8480)" 478 bool "Marvell Loki (88RC8480)"
491 select CPU_FEROCEON 479 select CPU_FEROCEON
492 select GENERIC_TIME
493 select GENERIC_CLOCKEVENTS 480 select GENERIC_CLOCKEVENTS
494 select PLAT_ORION 481 select PLAT_ORION
495 help 482 help
@@ -500,7 +487,6 @@ config ARCH_MV78XX0
500 select CPU_FEROCEON 487 select CPU_FEROCEON
501 select PCI 488 select PCI
502 select ARCH_REQUIRE_GPIOLIB 489 select ARCH_REQUIRE_GPIOLIB
503 select GENERIC_TIME
504 select GENERIC_CLOCKEVENTS 490 select GENERIC_CLOCKEVENTS
505 select PLAT_ORION 491 select PLAT_ORION
506 help 492 help
@@ -513,7 +499,6 @@ config ARCH_ORION5X
513 select CPU_FEROCEON 499 select CPU_FEROCEON
514 select PCI 500 select PCI
515 select ARCH_REQUIRE_GPIOLIB 501 select ARCH_REQUIRE_GPIOLIB
516 select GENERIC_TIME
517 select GENERIC_CLOCKEVENTS 502 select GENERIC_CLOCKEVENTS
518 select PLAT_ORION 503 select PLAT_ORION
519 help 504 help
@@ -526,7 +511,6 @@ config ARCH_MMP
526 depends on MMU 511 depends on MMU
527 select ARCH_REQUIRE_GPIOLIB 512 select ARCH_REQUIRE_GPIOLIB
528 select COMMON_CLKDEV 513 select COMMON_CLKDEV
529 select GENERIC_TIME
530 select GENERIC_CLOCKEVENTS 514 select GENERIC_CLOCKEVENTS
531 select TICK_ONESHOT 515 select TICK_ONESHOT
532 select PLAT_PXA 516 select PLAT_PXA
@@ -546,7 +530,6 @@ config ARCH_NS9XXX
546 bool "NetSilicon NS9xxx" 530 bool "NetSilicon NS9xxx"
547 select CPU_ARM926T 531 select CPU_ARM926T
548 select GENERIC_GPIO 532 select GENERIC_GPIO
549 select GENERIC_TIME
550 select GENERIC_CLOCKEVENTS 533 select GENERIC_CLOCKEVENTS
551 select HAVE_CLK 534 select HAVE_CLK
552 help 535 help
@@ -560,7 +543,6 @@ config ARCH_W90X900
560 select CPU_ARM926T 543 select CPU_ARM926T
561 select ARCH_REQUIRE_GPIOLIB 544 select ARCH_REQUIRE_GPIOLIB
562 select COMMON_CLKDEV 545 select COMMON_CLKDEV
563 select GENERIC_TIME
564 select GENERIC_CLOCKEVENTS 546 select GENERIC_CLOCKEVENTS
565 help 547 help
566 Support for Nuvoton (Winbond logic dept.) ARM9 processor, 548 Support for Nuvoton (Winbond logic dept.) ARM9 processor,
@@ -594,7 +576,6 @@ config ARCH_PXA
594 select ARCH_HAS_CPUFREQ 576 select ARCH_HAS_CPUFREQ
595 select COMMON_CLKDEV 577 select COMMON_CLKDEV
596 select ARCH_REQUIRE_GPIOLIB 578 select ARCH_REQUIRE_GPIOLIB
597 select GENERIC_TIME
598 select GENERIC_CLOCKEVENTS 579 select GENERIC_CLOCKEVENTS
599 select TICK_ONESHOT 580 select TICK_ONESHOT
600 select PLAT_PXA 581 select PLAT_PXA
@@ -604,7 +585,6 @@ config ARCH_PXA
604config ARCH_MSM 585config ARCH_MSM
605 bool "Qualcomm MSM" 586 bool "Qualcomm MSM"
606 select HAVE_CLK 587 select HAVE_CLK
607 select GENERIC_TIME
608 select GENERIC_CLOCKEVENTS 588 select GENERIC_CLOCKEVENTS
609 help 589 help
610 Support for Qualcomm MSM/QSD based systems. This runs on the 590 Support for Qualcomm MSM/QSD based systems. This runs on the
@@ -641,7 +621,6 @@ config ARCH_SA1100
641 select ARCH_MTD_XIP 621 select ARCH_MTD_XIP
642 select ARCH_HAS_CPUFREQ 622 select ARCH_HAS_CPUFREQ
643 select CPU_FREQ 623 select CPU_FREQ
644 select GENERIC_TIME
645 select GENERIC_CLOCKEVENTS 624 select GENERIC_CLOCKEVENTS
646 select HAVE_CLK 625 select HAVE_CLK
647 select TICK_ONESHOT 626 select TICK_ONESHOT
@@ -752,7 +731,6 @@ config ARCH_U300
752 select HAVE_TCM 731 select HAVE_TCM
753 select ARM_AMBA 732 select ARM_AMBA
754 select ARM_VIC 733 select ARM_VIC
755 select GENERIC_TIME
756 select GENERIC_CLOCKEVENTS 734 select GENERIC_CLOCKEVENTS
757 select COMMON_CLKDEV 735 select COMMON_CLKDEV
758 select GENERIC_GPIO 736 select GENERIC_GPIO
@@ -763,7 +741,6 @@ config ARCH_U8500
763 bool "ST-Ericsson U8500 Series" 741 bool "ST-Ericsson U8500 Series"
764 select CPU_V7 742 select CPU_V7
765 select ARM_AMBA 743 select ARM_AMBA
766 select GENERIC_TIME
767 select GENERIC_CLOCKEVENTS 744 select GENERIC_CLOCKEVENTS
768 select COMMON_CLKDEV 745 select COMMON_CLKDEV
769 select ARCH_REQUIRE_GPIOLIB 746 select ARCH_REQUIRE_GPIOLIB
@@ -776,7 +753,6 @@ config ARCH_NOMADIK
776 select ARM_VIC 753 select ARM_VIC
777 select CPU_ARM926T 754 select CPU_ARM926T
778 select COMMON_CLKDEV 755 select COMMON_CLKDEV
779 select GENERIC_TIME
780 select GENERIC_CLOCKEVENTS 756 select GENERIC_CLOCKEVENTS
781 select ARCH_REQUIRE_GPIOLIB 757 select ARCH_REQUIRE_GPIOLIB
782 help 758 help
@@ -785,7 +761,6 @@ config ARCH_NOMADIK
785config ARCH_DAVINCI 761config ARCH_DAVINCI
786 bool "TI DaVinci" 762 bool "TI DaVinci"
787 select CPU_ARM926T 763 select CPU_ARM926T
788 select GENERIC_TIME
789 select GENERIC_CLOCKEVENTS 764 select GENERIC_CLOCKEVENTS
790 select ARCH_REQUIRE_GPIOLIB 765 select ARCH_REQUIRE_GPIOLIB
791 select ZONE_DMA 766 select ZONE_DMA
@@ -801,7 +776,6 @@ config ARCH_OMAP
801 select HAVE_CLK 776 select HAVE_CLK
802 select ARCH_REQUIRE_GPIOLIB 777 select ARCH_REQUIRE_GPIOLIB
803 select ARCH_HAS_CPUFREQ 778 select ARCH_HAS_CPUFREQ
804 select GENERIC_TIME
805 select GENERIC_CLOCKEVENTS 779 select GENERIC_CLOCKEVENTS
806 select ARCH_HAS_HOLES_MEMORYMODEL 780 select ARCH_HAS_HOLES_MEMORYMODEL
807 help 781 help
@@ -813,7 +787,6 @@ config PLAT_SPEAR
813 select ARCH_REQUIRE_GPIOLIB 787 select ARCH_REQUIRE_GPIOLIB
814 select COMMON_CLKDEV 788 select COMMON_CLKDEV
815 select GENERIC_CLOCKEVENTS 789 select GENERIC_CLOCKEVENTS
816 select GENERIC_TIME
817 select HAVE_CLK 790 select HAVE_CLK
818 help 791 help
819 Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx). 792 Support for ST's SPEAr platform (SPEAr3xx, SPEAr6xx and SPEAr13xx).
@@ -951,7 +924,6 @@ config ARCH_ACORN
951config PLAT_IOP 924config PLAT_IOP
952 bool 925 bool
953 select GENERIC_CLOCKEVENTS 926 select GENERIC_CLOCKEVENTS
954 select GENERIC_TIME
955 927
956config PLAT_ORION 928config PLAT_ORION
957 bool 929 bool
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 103976411a67..841eaf8f27e2 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -23,14 +23,12 @@ choice
23config ARCH_AT91RM9200 23config ARCH_AT91RM9200
24 bool "AT91RM9200" 24 bool "AT91RM9200"
25 select CPU_ARM920T 25 select CPU_ARM920T
26 select GENERIC_TIME
27 select GENERIC_CLOCKEVENTS 26 select GENERIC_CLOCKEVENTS
28 select HAVE_AT91_USART3 27 select HAVE_AT91_USART3
29 28
30config ARCH_AT91SAM9260 29config ARCH_AT91SAM9260
31 bool "AT91SAM9260 or AT91SAM9XE" 30 bool "AT91SAM9260 or AT91SAM9XE"
32 select CPU_ARM926T 31 select CPU_ARM926T
33 select GENERIC_TIME
34 select GENERIC_CLOCKEVENTS 32 select GENERIC_CLOCKEVENTS
35 select HAVE_AT91_USART3 33 select HAVE_AT91_USART3
36 select HAVE_AT91_USART4 34 select HAVE_AT91_USART4
@@ -39,28 +37,24 @@ config ARCH_AT91SAM9260
39config ARCH_AT91SAM9261 37config ARCH_AT91SAM9261
40 bool "AT91SAM9261" 38 bool "AT91SAM9261"
41 select CPU_ARM926T 39 select CPU_ARM926T
42 select GENERIC_TIME
43 select GENERIC_CLOCKEVENTS 40 select GENERIC_CLOCKEVENTS
44 select HAVE_FB_ATMEL 41 select HAVE_FB_ATMEL
45 42
46config ARCH_AT91SAM9G10 43config ARCH_AT91SAM9G10
47 bool "AT91SAM9G10" 44 bool "AT91SAM9G10"
48 select CPU_ARM926T 45 select CPU_ARM926T
49 select GENERIC_TIME
50 select GENERIC_CLOCKEVENTS 46 select GENERIC_CLOCKEVENTS
51 select HAVE_FB_ATMEL 47 select HAVE_FB_ATMEL
52 48
53config ARCH_AT91SAM9263 49config ARCH_AT91SAM9263
54 bool "AT91SAM9263" 50 bool "AT91SAM9263"
55 select CPU_ARM926T 51 select CPU_ARM926T
56 select GENERIC_TIME
57 select GENERIC_CLOCKEVENTS 52 select GENERIC_CLOCKEVENTS
58 select HAVE_FB_ATMEL 53 select HAVE_FB_ATMEL
59 54
60config ARCH_AT91SAM9RL 55config ARCH_AT91SAM9RL
61 bool "AT91SAM9RL" 56 bool "AT91SAM9RL"
62 select CPU_ARM926T 57 select CPU_ARM926T
63 select GENERIC_TIME
64 select GENERIC_CLOCKEVENTS 58 select GENERIC_CLOCKEVENTS
65 select HAVE_AT91_USART3 59 select HAVE_AT91_USART3
66 select HAVE_FB_ATMEL 60 select HAVE_FB_ATMEL
@@ -68,7 +62,6 @@ config ARCH_AT91SAM9RL
68config ARCH_AT91SAM9G20 62config ARCH_AT91SAM9G20
69 bool "AT91SAM9G20" 63 bool "AT91SAM9G20"
70 select CPU_ARM926T 64 select CPU_ARM926T
71 select GENERIC_TIME
72 select GENERIC_CLOCKEVENTS 65 select GENERIC_CLOCKEVENTS
73 select HAVE_AT91_USART3 66 select HAVE_AT91_USART3
74 select HAVE_AT91_USART4 67 select HAVE_AT91_USART4
@@ -77,7 +70,6 @@ config ARCH_AT91SAM9G20
77config ARCH_AT91SAM9G45 70config ARCH_AT91SAM9G45
78 bool "AT91SAM9G45" 71 bool "AT91SAM9G45"
79 select CPU_ARM926T 72 select CPU_ARM926T
80 select GENERIC_TIME
81 select GENERIC_CLOCKEVENTS 73 select GENERIC_CLOCKEVENTS
82 select HAVE_AT91_USART3 74 select HAVE_AT91_USART3
83 select HAVE_FB_ATMEL 75 select HAVE_FB_ATMEL
@@ -85,14 +77,12 @@ config ARCH_AT91SAM9G45
85config ARCH_AT91CAP9 77config ARCH_AT91CAP9
86 bool "AT91CAP9" 78 bool "AT91CAP9"
87 select CPU_ARM926T 79 select CPU_ARM926T
88 select GENERIC_TIME
89 select GENERIC_CLOCKEVENTS 80 select GENERIC_CLOCKEVENTS
90 select HAVE_FB_ATMEL 81 select HAVE_FB_ATMEL
91 82
92config ARCH_AT572D940HF 83config ARCH_AT572D940HF
93 bool "AT572D940HF" 84 bool "AT572D940HF"
94 select CPU_ARM926T 85 select CPU_ARM926T
95 select GENERIC_TIME
96 select GENERIC_CLOCKEVENTS 86 select GENERIC_CLOCKEVENTS
97 87
98config ARCH_AT91X40 88config ARCH_AT91X40
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index aeceb9b92aeb..f2b88c5fe142 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -7,7 +7,6 @@ config ARCH_SH7367
7 select CPU_V6 7 select CPU_V6
8 select HAVE_CLK 8 select HAVE_CLK
9 select COMMON_CLKDEV 9 select COMMON_CLKDEV
10 select GENERIC_TIME
11 select GENERIC_CLOCKEVENTS 10 select GENERIC_CLOCKEVENTS
12 11
13config ARCH_SH7377 12config ARCH_SH7377
@@ -15,7 +14,6 @@ config ARCH_SH7377
15 select CPU_V7 14 select CPU_V7
16 select HAVE_CLK 15 select HAVE_CLK
17 select COMMON_CLKDEV 16 select COMMON_CLKDEV
18 select GENERIC_TIME
19 select GENERIC_CLOCKEVENTS 17 select GENERIC_CLOCKEVENTS
20 18
21config ARCH_SH7372 19config ARCH_SH7372
@@ -23,7 +21,6 @@ config ARCH_SH7372
23 select CPU_V7 21 select CPU_V7
24 select HAVE_CLK 22 select HAVE_CLK
25 select COMMON_CLKDEV 23 select COMMON_CLKDEV
26 select GENERIC_TIME
27 select GENERIC_CLOCKEVENTS 24 select GENERIC_CLOCKEVENTS
28 25
29comment "SH-Mobile Board Type" 26comment "SH-Mobile Board Type"
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-30 16:02:32 -0500