From 9c8f05c2837b06bb2739e85204c0d34009fb6494 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 5 Mar 2010 13:42:35 -0800 Subject: [PATCH] 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 Acked-by: Andres Salomon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/Kconfig | 2 -- drivers/clocksource/Kconfig | 9 --------- drivers/misc/Kconfig | 9 +++++++++ 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 drivers/clocksource/Kconfig diff --git a/drivers/Kconfig b/drivers/Kconfig index 368ae6d3a09..a2b902f4d43 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -96,8 +96,6 @@ source "drivers/edac/Kconfig" source "drivers/rtc/Kconfig" -source "drivers/clocksource/Kconfig" - source "drivers/dma/Kconfig" source "drivers/dca/Kconfig" diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig deleted file mode 100644 index 08f726c5fee..00000000000 --- a/drivers/clocksource/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -config CS5535_CLOCK_EVENT_SRC - tristate "CS5535/CS5536 high-res timer (MFGPT) events" - depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && CS5535_MFGPT - help - This driver provides a clock event source based on the MFGPT - timer(s) in the CS5535 and CS5536 companion chips. - MFGPTs have a better resolution and max interval than the - generic PIT, and are suitable for use as high-res timers. - diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index e3551d20464..d16af6a423f 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -212,6 +212,15 @@ config CS5535_MFGPT_DEFAULT_IRQ want to use a different IRQ by default. This is here for architectures to set as necessary. +config CS5535_CLOCK_EVENT_SRC + tristate "CS5535/CS5536 high-res timer (MFGPT) events" + depends on GENERIC_TIME && GENERIC_CLOCKEVENTS && CS5535_MFGPT + help + This driver provides a clock event source based on the MFGPT + timer(s) in the CS5535 and CS5536 companion chips. + MFGPTs have a better resolution and max interval than the + generic PIT, and are suitable for use as high-res timers. + config HP_ILO tristate "Channel interface driver for HP iLO/iLO2 processor" depends on PCI -- 2.39.3