diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-07-13 20:56:20 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-27 06:40:54 -0400 |
commit | 592913ecb87a9e06f98ddb55b298f1a66bf94c6b (patch) | |
tree | 0f63f5535fe517faf418e0f7e69800fcf1e4d8db /drivers/misc | |
parent | ce3bf7ab22527183634a76512d9854a38615e4d5 (diff) |
time: Kill off CONFIG_GENERIC_TIME
Now that all arches have been converted over to use generic time via
clocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME
config option and simplify the generic code.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <1279068988-21864-4-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 26386a92f5aa..5b9ba4834ce1 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -72,7 +72,7 @@ config ATMEL_TCLIB | |||
72 | 72 | ||
73 | config ATMEL_TCB_CLKSRC | 73 | config ATMEL_TCB_CLKSRC |
74 | bool "TC Block Clocksource" | 74 | bool "TC Block Clocksource" |
75 | depends on ATMEL_TCLIB && GENERIC_TIME | 75 | depends on ATMEL_TCLIB |
76 | default y | 76 | default y |
77 | help | 77 | help |
78 | Select this to get a high precision clocksource based on a | 78 | Select this to get a high precision clocksource based on a |
@@ -240,7 +240,7 @@ config CS5535_MFGPT_DEFAULT_IRQ | |||
240 | 240 | ||
241 | config CS5535_CLOCK_EVENT_SRC | 241 | config CS5535_CLOCK_EVENT_SRC |
242 | tristate "CS5535/CS5536 high-res timer (MFGPT) events" | 242 | tristate "CS5535/CS5536 high-res timer (MFGPT) events" |
243 | depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && CS5535_MFGPT | 243 | depends on GENERIC_CLOCKEVENTS && CS5535_MFGPT |
244 | help | 244 | help |
245 | This driver provides a clock event source based on the MFGPT | 245 | This driver provides a clock event source based on the MFGPT |
246 | timer(s) in the CS5535 and CS5536 companion chips. | 246 | timer(s) in the CS5535 and CS5536 companion chips. |