twl4030: move twl4030-pwrbutton to drivers/input/misc

Take it out of drivers/i2c/chips as requested by Jean Delvare
that all drivers move out of there.

Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Samuel Ortiz <sameo@openedhand.com>
Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index e4831e1017f3b412f52b13ec23017d1b4ac468f3..bf7bd1b9109e2b03d8bb3d268908ddbbe548b513 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -98,10 +98,6 @@ config TWL4030_MADC
          to build it as a dinamically loadable module. The module will be
          called twl4030-madc.ko
 
-config TWL4030_PWRBUTTON
-       tristate "TWL4030 Power button Driver"
-       depends on TWL4030_CORE
-
 config TWL4030_POWEROFF
        tristate "TWL4030 device poweroff"
        depends on TWL4030_CORE

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 1c947127b3d56a1cbf4f110d46a3f747a2f516d1..8da23eeebe581d8e8ce81df797b16d0d20d7f549 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_PCF8575)         += pcf8575.o
 obj-$(CONFIG_SENSORS_PCF8591)  += pcf8591.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 obj-$(CONFIG_TWL4030_POWEROFF) += twl4030-poweroff.o
-obj-$(CONFIG_TWL4030_PWRBUTTON)        += twl4030-pwrbutton.o
 obj-$(CONFIG_TWL4030_MADC)     += twl4030-madc.o
 obj-$(CONFIG_RTC_X1205_I2C)    += x1205.o
 

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 67e5553f699a1053224b233e1f2fb85b778471ec..9667b500cdca355faf32ca48189099c34a3af178 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -193,6 +193,10 @@ config INPUT_CM109
          To compile this driver as a module, choose M here: the module will be
          called cm109.
 
+config INPUT_TWL4030_PWRBUTTON
+       tristate "TWL4030 Power button Driver"
+       depends on TWL4030_CORE
+
 config INPUT_UINPUT
        tristate "User level driver support"
        help

diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index bb62e6efacf3476d78c66fd0c9a575c465f2a99a..2fabcdba827d2d50ccab87419483a4fc7d6882f5 100644 (file)
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
 obj-$(CONFIG_INPUT_CM109)              += cm109.o
 obj-$(CONFIG_HP_SDC_RTC)               += hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_UINPUT)             += uinput.o
+obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)  += twl4030-pwrbutton.o
 obj-$(CONFIG_INPUT_APANEL)             += apanel.o
 obj-$(CONFIG_INPUT_SGI_BTNS)           += sgi_btns.o
 obj-$(CONFIG_INPUT_PCF50633_PMU)       += pcf50633-input.o

diff --git a/drivers/i2c/chips/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
similarity index 100%
rename from drivers/i2c/chips/twl4030-pwrbutton.c
rename to drivers/input/misc/twl4030-pwrbutton.c

diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index 347b3788e2e86331e85ee26d27ff73d13355fe69..afc5894d02a0f1b79c6df554361d3e3532d3b889 100644 (file)
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -107,7 +107,8 @@
 #define twl_has_usb()  false
 #endif
 
-#if defined(CONFIG_TWL4030_PWRBUTTON) || defined(CONFIG_TWL4030_PWBUTTON_MODULE)
+#if defined(CONFIG_INPUT_TWL4030_PWRBUTTON) \
+       || defined(CONFIG_INPUT_TWL4030_PWBUTTON_MODULE)
 #define twl_has_pwrbutton()    true
 #else
 #define twl_has_pwrbutton()    false