diff options
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/clocksource/Kconfig | 9 | ||||
-rw-r--r-- | drivers/misc/Kconfig | 9 |
3 files changed, 9 insertions, 11 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 368ae6d3a096..a2b902f4d437 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -96,8 +96,6 @@ source "drivers/edac/Kconfig" | |||
96 | 96 | ||
97 | source "drivers/rtc/Kconfig" | 97 | source "drivers/rtc/Kconfig" |
98 | 98 | ||
99 | source "drivers/clocksource/Kconfig" | ||
100 | |||
101 | source "drivers/dma/Kconfig" | 99 | source "drivers/dma/Kconfig" |
102 | 100 | ||
103 | source "drivers/dca/Kconfig" | 101 | source "drivers/dca/Kconfig" |
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig deleted file mode 100644 index 08f726c5fee5..000000000000 --- a/drivers/clocksource/Kconfig +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | config CS5535_CLOCK_EVENT_SRC | ||
2 | tristate "CS5535/CS5536 high-res timer (MFGPT) events" | ||
3 | depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && CS5535_MFGPT | ||
4 | help | ||
5 | This driver provides a clock event source based on the MFGPT | ||
6 | timer(s) in the CS5535 and CS5536 companion chips. | ||
7 | MFGPTs have a better resolution and max interval than the | ||
8 | generic PIT, and are suitable for use as high-res timers. | ||
9 | |||
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index e3551d20464f..d16af6a423fb 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig | |||
@@ -212,6 +212,15 @@ config CS5535_MFGPT_DEFAULT_IRQ | |||
212 | want to use a different IRQ by default. This is here for | 212 | want to use a different IRQ by default. This is here for |
213 | architectures to set as necessary. | 213 | architectures to set as necessary. |
214 | 214 | ||
215 | config CS5535_CLOCK_EVENT_SRC | ||
216 | tristate "CS5535/CS5536 high-res timer (MFGPT) events" | ||
217 | depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && CS5535_MFGPT | ||
218 | help | ||
219 | This driver provides a clock event source based on the MFGPT | ||
220 | timer(s) in the CS5535 and CS5536 companion chips. | ||
221 | MFGPTs have a better resolution and max interval than the | ||
222 | generic PIT, and are suitable for use as high-res timers. | ||
223 | |||
215 | config HP_ILO | 224 | config HP_ILO |
216 | tristate "Channel interface driver for HP iLO/iLO2 processor" | 225 | tristate "Channel interface driver for HP iLO/iLO2 processor" |
217 | depends on PCI | 226 | depends on PCI |