[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 7a95b0856616f7fa20a75b7691ba9184f0603ca2
Author: tim.niemeyer at mastersword.de <tim.niemeyer at mastersword.de>
Date:   Tue Mar 24 11:11:18 2009 +0100

    Remove double INPUT_PCF6333_PMU in Kconfig/Makefile
    
    Signed-off-by: Tim Niemeyer <reddog at mastersword.de>

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6ebf23e..ab69a5b 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -220,13 +220,6 @@ config HP_SDC_RTC
 	  Say Y here if you want to support the built-in real time clock
 	  of the HP SDC controller.
 
-config INPUT_PCF50633_PMU
-	tristate "PCF50633 PMU events"
-	depends on MFD_PCF50633
-	help
-	 Say Y to include support for delivering  PMU events via  input
-	 layer on NXP PCF50633.
-
 config INPUT_LIS302DL
 	tristate "STmicro LIS302DL 3-axis accelerometer"
 	depends on SPI_MASTER
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 0102c9e..b0280d4 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
 obj-$(CONFIG_INPUT_APANEL)		+= apanel.o
 obj-$(CONFIG_INPUT_SGI_BTNS)		+= sgi_btns.o
-obj-$(CONFIG_INPUT_PCF50633_PMU)	+= pcf50633-input.o
 obj-$(CONFIG_INPUT_LIS302DL)		+= lis302dl.o
 obj-$(CONFIG_INPUT_PCF50633_PMU)	+= pcf50633-input.o
 obj-$(CONFIG_INPUT_PCF50606_PMU)	+= pcf50606-input.o

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko