On Thu, Jan 10, 2008 at 04:41:18PM +0100, Sam Ravnborg wrote:
On Thu, Jan 10, 2008 at 11:51:10AM +, Mark Brown wrote:
+wm97xx-ts-objs := wm97xx-core.o
Use
wm97xx-ts-y := wm97xx-core.o
+wm97xx-ts-objs += wm9713.o
+endif
So this becomes:
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
Same for the other two assignments.
Ah, that's much nicer - thanks! I've made this change in our git tree:
From 550829a5933d4cf4f667530cdd275faf800d2188 Mon Sep 17 00:00:00 2001
From: Mark Brown [EMAIL PROTECTED]
Date: Tue, 13 Nov 2007 22:36:50 +
Subject: [PATCH] Build system and MAINTAINERS entry for WM97xx touchscreen
drivers
Signed-off-by: Mark Brown [EMAIL PROTECTED]
Signed-off-by: Liam Girdwood [EMAIL PROTECTED]
---
MAINTAINERS|9 ++
drivers/input/touchscreen/Kconfig | 52
drivers/input/touchscreen/Makefile |7 +
3 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index b4f611c..62131fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4196,6 +4196,15 @@ L: [EMAIL PROTECTED]
W: http://oops.ghostprotocols.net:81/blog
S: Maintained
+WM97XX TOUCHSCREEN DRIVERS
+P: Mark Brown
+M: [EMAIL PROTECTED]
+P: Liam Girdwood
+M: [EMAIL PROTECTED]
+L: [EMAIL PROTECTED]
+T: git git://opensource.wolfsonmicro.com/linux-2.6-touch
+S: Supported
+
X.25 NETWORK LAYER
P: Henner Eisen
M: [EMAIL PROTECTED]
diff --git a/drivers/input/touchscreen/Kconfig
b/drivers/input/touchscreen/Kconfig
index fa8442b..89fa468 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -160,6 +160,58 @@ config TOUCHSCREEN_TOUCHRIGHT
To compile this driver as a module, choose M here: the
module will be called touchright.
+config TOUCHSCREEN_WM97XX
+ tristate Support for WM97xx AC97 touchscreen controllers
+ depends on AC97_BUS
+
+config TOUCHSCREEN_WM9705
+ bool WM9705 Touchscreen interface support
+ depends on TOUCHSCREEN_WM97XX
+ help
+ Say Y here if you have a Wolfson Microelectronics WM9705 touchscreen
+ controller connected to your system.
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called wm9705.
+
+config TOUCHSCREEN_WM9712
+ bool WM9712 Touchscreen interface support
+ depends on TOUCHSCREEN_WM97XX
+ help
+ Say Y here if you have a Wolfson Microelectronics WM9712 touchscreen
+ controller connected to your system.
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called wm9712.
+
+config TOUCHSCREEN_WM9713
+ bool WM9713 Touchscreen interface support
+ depends on TOUCHSCREEN_WM97XX
+ help
+ Say Y here if you have a Wolfson Microelectronics WM9713 touchscreen
+ controller connected to your system.
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called wm9713.
+
+config TOUCHSCREEN_WM97XX_PXA
+ tristate WM97xx PXA accelerated touch
+ depends on TOUCHSCREEN_WM97XX ARCH_PXA
+ help
+ Say Y here for support for streaming mode with WM97xx touchscreens
+ on systems with PXA2xx series processors.
+
+ If unsure, say N
+
+ To compile this driver as a module, choose M here: the
+ module will be called pxa-wm97xx
+
config TOUCHSCREEN_TOUCHWIN
tristate Touchwin serial touchscreen
select SERIO
diff --git a/drivers/input/touchscreen/Makefile
b/drivers/input/touchscreen/Makefile
index 35d4097..ade9dc1 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -4,6 +4,8 @@
# Each configuration option enables a list of files.
+wm97xx-ts-y := wm97xx-core.o
+
obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o
obj-$(CONFIG_TOUCHSCREEN_BITSY)+= h3600_ts_input.o
obj-$(CONFIG_TOUCHSCREEN_CORGI)+= corgi_ts.o
@@ -19,3 +21,8 @@ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)+= penmount.o
obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
+obj-$(CONFIG_TOUCHSCREEN_WM97XX) += wm97xx-ts.o
+obj-$(CONFIG_TOUCHSCREEN_WM97XX_PXA) += pxa-wm97xx.o
+wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705) += wm9705.o
+wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o
+wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
--
1.5.3.8
