summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLin Fuzhen <fuzhen.lin@freescale.com>2012-06-19 10:37:45 +0800
committerLin Fuzhen <fuzhen.lin@freescale.com>2012-06-19 16:27:27 +0800
commit7bcf0a1dad8ffab2a949d086ce17d3e76739b89d (patch)
treee303df0ed16280a36a6f65b2d6898e76d129c329 /drivers
parent9c55dcb1ff5b79d6c02f72da05122cfc4250db2e (diff)
ENGR00214081-1 Input: Remove redefined Item in Kconfig And Makefile
Remove redefined Item in Kconfig And Makefile for MAX11081 Signed-off-by: Lin Fuzhen <fuzhen.lin@freescale.com>
Diffstat (limited to 'drivers')
-rwxr-xr-xdrivers/input/touchscreen/Kconfig12
-rwxr-xr-xdrivers/input/touchscreen/Makefile1
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index bf002d471b1f..13970487e0fc 100755
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -773,16 +773,4 @@ config TOUCHSCREEN_DA9052
help
Say y here to support the touchscreen found on
Dialog Semiconductor DA9052 PMIC
-
-config TOUCHSCREEN_MAX11801
- tristate "MAX11801 based touchscreens"
- depends on I2C
- help
- Say Y here if you have a MAX11801 based touchscreen
- controller
-
- If unsure, say N.
-
- To compile this driver as a module, choose M here: the
- module will be called max11801_ts
endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 28ac2d2c81bd..2b3911373daa 100755
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o
obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o
obj-$(CONFIG_TOUCHSCREEN_LPC32XX) += lpc32xx_ts.o
-obj-$(CONFIG_TOUCHSCREEN_MAX11801) += max11801_ts.o
obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o
obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o
obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o