[PATCH] chardev: GPIO for SCx200 & PC-8736x: add proper Kconfig, Makefile entries

Replace the temp makefile hacks with proper CONFIG entries, which are also
added to Kconfig.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 3610c57295533c81807bbddfd174ab1ede354551..410d70cb76fbee1a6b97f329ea78d9e16788c4fc 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -939,12 +939,35 @@ config MWAVE
 config SCx200_GPIO
        tristate "NatSemi SCx200 GPIO Support"
        depends on SCx200
+       select NSC_GPIO
        help
          Give userspace access to the GPIO pins on the National
          Semiconductor SCx200 processors.
 
          If compiled as a module, it will be called scx200_gpio.
 
+config PC8736x_GPIO
+       tristate "NatSemi PC8736x GPIO Support"
+       depends on X86
+       default SCx200_GPIO     # mostly N
+       select NSC_GPIO         # needed for support routines
+       help
+         Give userspace access to the GPIO pins on the National
+         Semiconductor PC-8736x (x=[03456]) SuperIO chip.  The chip
+         has multiple functional units, inc several managed by
+         hwmon/pc87360 driver.  Tested with PC-87366
+
+         If compiled as a module, it will be called pc8736x_gpio.
+
+config NSC_GPIO
+       tristate "NatSemi Base GPIO Support"
+       # selected by SCx200_GPIO and PC8736x_GPIO
+       # what about 2 selectors differing: m != y
+       help
+         Common support used (and needed) by scx200_gpio and
+         pc8736x_gpio drivers.  If those drivers are built as
+         modules, this one will be too, named nsc_gpio
+
 config CS5535_GPIO
        tristate "AMD CS5535/CS5536 GPIO (Geode Companion Device)"
        depends on X86_32

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index a6c528aa35ab7a4fb6e303717d4d6a88435782a0..6e0f4469d8bbdbf37197a7e722131acf48378bf7 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -81,7 +81,9 @@ obj-$(CONFIG_COBALT_LCD)      += lcd.o
 obj-$(CONFIG_PPDEV)            += ppdev.o
 obj-$(CONFIG_NWBUTTON)         += nwbutton.o
 obj-$(CONFIG_NWFLASH)          += nwflash.o
-obj-$(CONFIG_SCx200_GPIO)      += scx200_gpio.o nsc_gpio.o pc8736x_gpio.o
+obj-$(CONFIG_SCx200_GPIO)      += scx200_gpio.o
+obj-$(CONFIG_PC8736x_GPIO)     += pc8736x_gpio.o
+obj-$(CONFIG_NSC_GPIO)         += nsc_gpio.o
 obj-$(CONFIG_CS5535_GPIO)      += cs5535_gpio.o
 obj-$(CONFIG_GPIO_VR41XX)      += vr41xx_giu.o
 obj-$(CONFIG_TANBAC_TB0219)    += tb0219.o