[PATCH] MFGPT: move clocksource menu

[PATCH] MFGPT: move clocksource menu

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

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>
Cc: Andres Salomon <dilinger@collabora.co.uk>
---
 drivers/Kconfig             |    2 --
 drivers/clocksource/Kconfig |    9 ---------
 drivers/misc/Kconfig        |    9 +++++++++
 3 files changed, 9 insertions(+), 11 deletions(-)

--- lnx-2633-rc1.orig/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.
-
--- lnx-2633-rc1.orig/drivers/misc/Kconfig
+++ lnx-2633-rc1/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
--- lnx-2633-rc1.orig/drivers/Kconfig
+++ lnx-2633-rc1/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"

Re: [PATCH] MFGPT: move clocksource menu

[Andres Salomon]

Sure, fine w/ me.

Acked-by: Andres Salomon <dilinger@collabora.co.uk>


On Tue, 22 Dec 2009 12:09:05 -0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> 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>
> Cc: Andres Salomon <dilinger@collabora.co.uk>
> ---
>  drivers/Kconfig             |    2 --
>  drivers/clocksource/Kconfig |    9 ---------
>  drivers/misc/Kconfig        |    9 +++++++++
>  3 files changed, 9 insertions(+), 11 deletions(-)