diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/Kconfig | 4 | ||||
-rw-r--r-- | arch/avr32/Kconfig | 3 | ||||
-rw-r--r-- | arch/blackfin/Kconfig | 3 | ||||
-rw-r--r-- | arch/cris/Kconfig | 3 | ||||
-rw-r--r-- | arch/frv/Kconfig | 4 | ||||
-rw-r--r-- | arch/h8300/Kconfig | 4 | ||||
-rw-r--r-- | arch/ia64/Kconfig | 4 | ||||
-rw-r--r-- | arch/m32r/Kconfig | 3 | ||||
-rw-r--r-- | arch/m68k/Kconfig | 3 | ||||
-rw-r--r-- | arch/m68knommu/Kconfig | 4 | ||||
-rw-r--r-- | arch/microblaze/Kconfig | 3 | ||||
-rw-r--r-- | arch/mips/Kconfig | 4 | ||||
-rw-r--r-- | arch/mn10300/Kconfig | 3 | ||||
-rw-r--r-- | arch/parisc/Kconfig | 4 | ||||
-rw-r--r-- | arch/powerpc/Kconfig | 3 | ||||
-rw-r--r-- | arch/s390/Kconfig | 3 | ||||
-rw-r--r-- | arch/score/Kconfig | 3 | ||||
-rw-r--r-- | arch/sh/Kconfig | 3 | ||||
-rw-r--r-- | arch/sparc/Kconfig | 3 | ||||
-rw-r--r-- | arch/um/Kconfig.common | 4 | ||||
-rw-r--r-- | arch/x86/Kconfig | 5 | ||||
-rw-r--r-- | arch/xtensa/Kconfig | 3 |
23 files changed, 1 insertions, 79 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 3e2e540a0f2a..b9647bb66d13 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
@@ -47,10 +47,6 @@ config GENERIC_CALIBRATE_DELAY | |||
47 | bool | 47 | bool |
48 | default y | 48 | default y |
49 | 49 | ||
50 | config GENERIC_TIME | ||
51 | bool | ||
52 | default y | ||
53 | |||
54 | config GENERIC_CMOS_UPDATE | 50 | config GENERIC_CMOS_UPDATE |
55 | def_bool y | 51 | def_bool y |
56 | 52 | ||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 98922f7d2d12..655b4ae76314 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -41,10 +41,6 @@ config SYS_SUPPORTS_APM_EMULATION | |||
41 | config GENERIC_GPIO | 41 | config GENERIC_GPIO |
42 | bool | 42 | bool |
43 | 43 | ||
44 | config GENERIC_TIME | ||
45 | bool | ||
46 | default y | ||
47 | |||
48 | config ARCH_USES_GETTIMEOFFSET | 44 | config ARCH_USES_GETTIMEOFFSET |
49 | bool | 45 | bool |
50 | default n | 46 | default n |
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index f2b319333184..f51572772e21 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig | |||
@@ -45,9 +45,6 @@ config GENERIC_IRQ_PROBE | |||
45 | config RWSEM_GENERIC_SPINLOCK | 45 | config RWSEM_GENERIC_SPINLOCK |
46 | def_bool y | 46 | def_bool y |
47 | 47 | ||
48 | config GENERIC_TIME | ||
49 | def_bool y | ||
50 | |||
51 | config GENERIC_CLOCKEVENTS | 48 | config GENERIC_CLOCKEVENTS |
52 | def_bool y | 49 | def_bool y |
53 | 50 | ||
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index f66294b4f9d2..c88fd3584122 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -614,9 +614,6 @@ comment "Kernel Timer/Scheduler" | |||
614 | 614 | ||
615 | source kernel/Kconfig.hz | 615 | source kernel/Kconfig.hz |
616 | 616 | ||
617 | config GENERIC_TIME | ||
618 | def_bool y | ||
619 | |||
620 | config GENERIC_CLOCKEVENTS | 617 | config GENERIC_CLOCKEVENTS |
621 | bool "Generic clock events" | 618 | bool "Generic clock events" |
622 | default y | 619 | default y |
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index e25bf4440b51..887ef855be2a 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -20,9 +20,6 @@ config RWSEM_GENERIC_SPINLOCK | |||
20 | config RWSEM_XCHGADD_ALGORITHM | 20 | config RWSEM_XCHGADD_ALGORITHM |
21 | bool | 21 | bool |
22 | 22 | ||
23 | config GENERIC_TIME | ||
24 | def_bool y | ||
25 | |||
26 | config GENERIC_CMOS_UPDATE | 23 | config GENERIC_CMOS_UPDATE |
27 | def_bool y | 24 | def_bool y |
28 | 25 | ||
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 4b5830bcbe2e..16399bd24993 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
@@ -40,10 +40,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ | |||
40 | bool | 40 | bool |
41 | default y | 41 | default y |
42 | 42 | ||
43 | config GENERIC_TIME | ||
44 | bool | ||
45 | default y | ||
46 | |||
47 | config TIME_LOW_RES | 43 | config TIME_LOW_RES |
48 | bool | 44 | bool |
49 | default y | 45 | default y |
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig index 53cc669e6d59..988b6ff34cc4 100644 --- a/arch/h8300/Kconfig +++ b/arch/h8300/Kconfig | |||
@@ -62,10 +62,6 @@ config GENERIC_CALIBRATE_DELAY | |||
62 | bool | 62 | bool |
63 | default y | 63 | default y |
64 | 64 | ||
65 | config GENERIC_TIME | ||
66 | bool | ||
67 | default y | ||
68 | |||
69 | config GENERIC_BUG | 65 | config GENERIC_BUG |
70 | bool | 66 | bool |
71 | depends on BUG | 67 | depends on BUG |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 95610820041e..8711d13cd79f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -82,10 +82,6 @@ config GENERIC_CALIBRATE_DELAY | |||
82 | bool | 82 | bool |
83 | default y | 83 | default y |
84 | 84 | ||
85 | config GENERIC_TIME | ||
86 | bool | ||
87 | default y | ||
88 | |||
89 | config GENERIC_TIME_VSYSCALL | 85 | config GENERIC_TIME_VSYSCALL |
90 | bool | 86 | bool |
91 | default y | 87 | default y |
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 3a9319f93e89..836abbbc9c04 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -44,9 +44,6 @@ config HZ | |||
44 | int | 44 | int |
45 | default 100 | 45 | default 100 |
46 | 46 | ||
47 | config GENERIC_TIME | ||
48 | def_bool y | ||
49 | |||
50 | config ARCH_USES_GETTIMEOFFSET | 47 | config ARCH_USES_GETTIMEOFFSET |
51 | def_bool y | 48 | def_bool y |
52 | 49 | ||
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 2e3737b92ffc..8030e2481d97 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -59,9 +59,6 @@ config HZ | |||
59 | int | 59 | int |
60 | default 100 | 60 | default 100 |
61 | 61 | ||
62 | config GENERIC_TIME | ||
63 | def_bool y | ||
64 | |||
65 | config ARCH_USES_GETTIMEOFFSET | 62 | config ARCH_USES_GETTIMEOFFSET |
66 | def_bool y | 63 | def_bool y |
67 | 64 | ||
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index efeb6033fc17..2609c394e1df 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
@@ -63,10 +63,6 @@ config GENERIC_CALIBRATE_DELAY | |||
63 | bool | 63 | bool |
64 | default y | 64 | default y |
65 | 65 | ||
66 | config GENERIC_TIME | ||
67 | bool | ||
68 | default y | ||
69 | |||
70 | config GENERIC_CMOS_UPDATE | 66 | config GENERIC_CMOS_UPDATE |
71 | bool | 67 | bool |
72 | default y | 68 | default y |
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 505a08592423..14f03cea94a1 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
@@ -48,9 +48,6 @@ config GENERIC_IRQ_PROBE | |||
48 | config GENERIC_CALIBRATE_DELAY | 48 | config GENERIC_CALIBRATE_DELAY |
49 | def_bool y | 49 | def_bool y |
50 | 50 | ||
51 | config GENERIC_TIME | ||
52 | def_bool y | ||
53 | |||
54 | config GENERIC_TIME_VSYSCALL | 51 | config GENERIC_TIME_VSYSCALL |
55 | def_bool n | 52 | def_bool n |
56 | 53 | ||
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index cdaae942623d..01c44cbdf163 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -733,10 +733,6 @@ config GENERIC_CLOCKEVENTS | |||
733 | bool | 733 | bool |
734 | default y | 734 | default y |
735 | 735 | ||
736 | config GENERIC_TIME | ||
737 | bool | ||
738 | default y | ||
739 | |||
740 | config GENERIC_CMOS_UPDATE | 736 | config GENERIC_CMOS_UPDATE |
741 | bool | 737 | bool |
742 | default y | 738 | default y |
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 1c4565a9102b..444b9f918fdf 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
@@ -46,9 +46,6 @@ config GENERIC_FIND_NEXT_BIT | |||
46 | config GENERIC_HWEIGHT | 46 | config GENERIC_HWEIGHT |
47 | def_bool y | 47 | def_bool y |
48 | 48 | ||
49 | config GENERIC_TIME | ||
50 | def_bool y | ||
51 | |||
52 | config GENERIC_BUG | 49 | config GENERIC_BUG |
53 | def_bool y | 50 | def_bool y |
54 | 51 | ||
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 05a366a5c4d5..907417d187e1 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -66,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY | |||
66 | bool | 66 | bool |
67 | default y | 67 | default y |
68 | 68 | ||
69 | config GENERIC_TIME | ||
70 | bool | ||
71 | default y | ||
72 | |||
73 | config TIME_LOW_RES | 69 | config TIME_LOW_RES |
74 | bool | 70 | bool |
75 | depends on SMP | 71 | depends on SMP |
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 2031a2846865..25e6bf457457 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -29,9 +29,6 @@ config MMU | |||
29 | config GENERIC_CMOS_UPDATE | 29 | config GENERIC_CMOS_UPDATE |
30 | def_bool y | 30 | def_bool y |
31 | 31 | ||
32 | config GENERIC_TIME | ||
33 | def_bool y | ||
34 | |||
35 | config GENERIC_TIME_VSYSCALL | 32 | config GENERIC_TIME_VSYSCALL |
36 | def_bool y | 33 | def_bool y |
37 | 34 | ||
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index bee1c0f794cf..f0777a47e3a5 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -40,9 +40,6 @@ config ARCH_HAS_ILOG2_U64 | |||
40 | config GENERIC_HWEIGHT | 40 | config GENERIC_HWEIGHT |
41 | def_bool y | 41 | def_bool y |
42 | 42 | ||
43 | config GENERIC_TIME | ||
44 | def_bool y | ||
45 | |||
46 | config GENERIC_TIME_VSYSCALL | 43 | config GENERIC_TIME_VSYSCALL |
47 | def_bool y | 44 | def_bool y |
48 | 45 | ||
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 55d413e6dcf2..be4a15584751 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig | |||
@@ -55,9 +55,6 @@ config GENERIC_CALIBRATE_DELAY | |||
55 | config GENERIC_CLOCKEVENTS | 55 | config GENERIC_CLOCKEVENTS |
56 | def_bool y | 56 | def_bool y |
57 | 57 | ||
58 | config GENERIC_TIME | ||
59 | def_bool y | ||
60 | |||
61 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 58 | config SCHED_NO_NO_OMIT_FRAME_POINTER |
62 | def_bool y | 59 | def_bool y |
63 | 60 | ||
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 82868fee21fd..33990fa95af0 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -98,9 +98,6 @@ config GENERIC_CALIBRATE_DELAY | |||
98 | config GENERIC_IOMAP | 98 | config GENERIC_IOMAP |
99 | bool | 99 | bool |
100 | 100 | ||
101 | config GENERIC_TIME | ||
102 | def_bool y | ||
103 | |||
104 | config GENERIC_CLOCKEVENTS | 101 | config GENERIC_CLOCKEVENTS |
105 | def_bool y | 102 | def_bool y |
106 | 103 | ||
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index c0015db247ba..1cd0d9d3c761 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -66,9 +66,6 @@ config BITS | |||
66 | default 32 if SPARC32 | 66 | default 32 if SPARC32 |
67 | default 64 if SPARC64 | 67 | default 64 if SPARC64 |
68 | 68 | ||
69 | config GENERIC_TIME | ||
70 | def_bool y | ||
71 | |||
72 | config ARCH_USES_GETTIMEOFFSET | 69 | config ARCH_USES_GETTIMEOFFSET |
73 | bool | 70 | bool |
74 | default y if SPARC32 | 71 | default y if SPARC32 |
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index 0d207e73a758..7c8e277f6d34 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common | |||
@@ -55,10 +55,6 @@ config GENERIC_BUG | |||
55 | default y | 55 | default y |
56 | depends on BUG | 56 | depends on BUG |
57 | 57 | ||
58 | config GENERIC_TIME | ||
59 | bool | ||
60 | default y | ||
61 | |||
62 | config GENERIC_CLOCKEVENTS | 58 | config GENERIC_CLOCKEVENTS |
63 | bool | 59 | bool |
64 | default y | 60 | default y |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dcb0593b4a66..546b610ad71c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -72,9 +72,6 @@ config ARCH_DEFCONFIG | |||
72 | default "arch/x86/configs/i386_defconfig" if X86_32 | 72 | default "arch/x86/configs/i386_defconfig" if X86_32 |
73 | default "arch/x86/configs/x86_64_defconfig" if X86_64 | 73 | default "arch/x86/configs/x86_64_defconfig" if X86_64 |
74 | 74 | ||
75 | config GENERIC_TIME | ||
76 | def_bool y | ||
77 | |||
78 | config GENERIC_CMOS_UPDATE | 75 | config GENERIC_CMOS_UPDATE |
79 | def_bool y | 76 | def_bool y |
80 | 77 | ||
@@ -2046,7 +2043,7 @@ config SCx200 | |||
2046 | 2043 | ||
2047 | config SCx200HR_TIMER | 2044 | config SCx200HR_TIMER |
2048 | tristate "NatSemi SCx200 27MHz High-Resolution Timer Support" | 2045 | tristate "NatSemi SCx200 27MHz High-Resolution Timer Support" |
2049 | depends on SCx200 && GENERIC_TIME | 2046 | depends on SCx200 |
2050 | default y | 2047 | default y |
2051 | ---help--- | 2048 | ---help--- |
2052 | This driver provides a clocksource built upon the on-chip | 2049 | This driver provides a clocksource built upon the on-chip |
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index ebe228d02b08..0859bfd8ae93 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -48,9 +48,6 @@ config HZ | |||
48 | int | 48 | int |
49 | default 100 | 49 | default 100 |
50 | 50 | ||
51 | config GENERIC_TIME | ||
52 | def_bool y | ||
53 | |||
54 | source "init/Kconfig" | 51 | source "init/Kconfig" |
55 | source "kernel/Kconfig.freezer" | 52 | source "kernel/Kconfig.freezer" |
56 | 53 | ||