Commit 9c8f05c2837b06bb2739e85204c0d34009fb6494

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent 3b2a8c8f3c

MFGPT: move clocksource menu

Move the CS5535 MFGPT hrtimer kconfig option to be with the other MFGPT
options.  This makes it easier to find and also removes it from the main
"Device Drivers" menu, where it should not have been.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Andres Salomon <dilinger@collabora.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 9 additions and 11 deletions Side-by-side Diff

... ... @@ -96,8 +96,6 @@
96 96  
97 97 source "drivers/rtc/Kconfig"
98 98  
99   -source "drivers/clocksource/Kconfig"
100   -
101 99 source "drivers/dma/Kconfig"
102 100  
103 101 source "drivers/dca/Kconfig"
drivers/clocksource/Kconfig
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.
drivers/misc/Kconfig
... ... @@ -212,6 +212,15 @@
212 212 want to use a different IRQ by default. This is here for
213 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 224 config HP_ILO
216 225 tristate "Channel interface driver for HP iLO/iLO2 processor"
217 226 depends on PCI