Title: [8955] trunk/drivers/input/touchscreen: [#6066] AD7160 Linux Driver Support: Avoid MODULE/BUILTIN config mismatch
- Revision
- 8955
- Author
- hennerich
- Date
- 2010-06-29 11:47:13 -0400 (Tue, 29 Jun 2010)
Log Message
[#6066] AD7160 Linux Driver Support: Avoid MODULE/BUILTIN config mismatch
Modified Paths
Diff
Modified: trunk/drivers/input/touchscreen/Kconfig (8954 => 8955)
--- trunk/drivers/input/touchscreen/Kconfig 2010-06-29 09:54:25 UTC (rev 8954)
+++ trunk/drivers/input/touchscreen/Kconfig 2010-06-29 15:47:13 UTC (rev 8955)
@@ -100,7 +100,7 @@
module will be called ad7160.
config TOUCHSCREEN_AD7160_RAW
- tristate "AD7160 based touchscreens raw data interface"
+ bool "AD7160 based touchscreens raw data interface"
depends on TOUCHSCREEN_AD7160
help
Say Y here if you have a touchscreen interface using the AD7160
Modified: trunk/drivers/input/touchscreen/Makefile (8954 => 8955)
--- trunk/drivers/input/touchscreen/Makefile 2010-06-29 09:54:25 UTC (rev 8954)
+++ trunk/drivers/input/touchscreen/Makefile 2010-06-29 15:47:13 UTC (rev 8955)
@@ -5,6 +5,7 @@
# Each configuration option enables a list of files.
wm97xx-ts-y := wm97xx-core.o
+ad7160-ts-y := ad7160.o ad7160-i2c.o
obj-$(CONFIG_TOUCHSCREEN_88PM860X) += 88pm860x-ts.o
obj-$(CONFIG_TOUCHSCREEN_AD7877) += ad7877.o
@@ -48,5 +49,5 @@
obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o
obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o
obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o
-obj-$(CONFIG_TOUCHSCREEN_AD7160) += ad7160.o ad7160-i2c.o
-obj-$(CONFIG_TOUCHSCREEN_AD7160_RAW) += ad7160-raw.o
+obj-$(CONFIG_TOUCHSCREEN_AD7160) += ad7160-ts.o
+ad7160-ts-$(CONFIG_TOUCHSCREEN_AD7160_RAW) += ad7160-raw.o
Modified: trunk/drivers/input/touchscreen/ad7160.h (8954 => 8955)
--- trunk/drivers/input/touchscreen/ad7160.h 2010-06-29 09:54:25 UTC (rev 8954)
+++ trunk/drivers/input/touchscreen/ad7160.h 2010-06-29 15:47:13 UTC (rev 8955)
@@ -33,7 +33,7 @@
int ad7160_probe(struct device *dev, struct ad7160_bus_data *bdata, u32 devid, u16 bustype);
int ad7160_remove(struct device *dev);
-#ifdef CONFIG_TOUCHSCREEN_AD7160_RAW
+#if defined(CONFIG_TOUCHSCREEN_AD7160_RAW) || defined(CONFIG_TOUCHSCREEN_AD7160_RAW_MODULE)
int ad7160_probe_raw(struct device *dev, struct ad7160_bus_data *bdata, u32 devid, u16 bustype);
int ad7160_remove_raw(struct device *dev);
void ad7160_feed_raw(void);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
