From 7f4ef4c12533e1b559662b6e88860b7aa41922a2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 18 Dec 2009 11:04:54 -0800
Subject: [PATCH] --- yaml --- r: 186545 b: refs/heads/master c:
 293c0db0dd2a7f1a8074645faa9d3a0294623002 h: refs/heads/master i:   186543:
 b65ba194c8a10e16b563e4800d608d8a37054e7f v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/Kconfig         |  2 ++
 trunk/drivers/staging/Makefile        |  1 +
 trunk/drivers/staging/dt3155/Kconfig  |  4 ++++
 trunk/drivers/staging/dt3155/Makefile | 33 +++++----------------------
 5 files changed, 14 insertions(+), 28 deletions(-)
 create mode 100644 trunk/drivers/staging/dt3155/Kconfig

diff --git a/[refs] b/[refs]
index ddecd7da0855..97a3278b3cb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bad9f950c011c50e8302b48244229c0250add9b4
+refs/heads/master: 293c0db0dd2a7f1a8074645faa9d3a0294623002
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index fc2e963e65e9..02cde3989c5c 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/drivers/staging/Kconfig
@@ -143,5 +143,7 @@ source "drivers/staging/netwave/Kconfig"
 
 source "drivers/staging/sm7xx/Kconfig"
 
+source "drivers/staging/dt3155/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index b5e67b889f60..9d47d42e73ce 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -53,3 +53,4 @@ obj-$(CONFIG_WAVELAN)		+= wavelan/
 obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan/
 obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave/
 obj-$(CONFIG_FB_SM7XX)		+= sm7xx/
+obj-$(CONFIG_DT3155)		+= dt3155/
diff --git a/trunk/drivers/staging/dt3155/Kconfig b/trunk/drivers/staging/dt3155/Kconfig
new file mode 100644
index 000000000000..4a3293c721b1
--- /dev/null
+++ b/trunk/drivers/staging/dt3155/Kconfig
@@ -0,0 +1,4 @@
+config DT3155
+	tristate "DT3155 Digitizer support"
+	depends on PCI
+
diff --git a/trunk/drivers/staging/dt3155/Makefile b/trunk/drivers/staging/dt3155/Makefile
index 1717ffbf682f..136f21fdbbee 100644
--- a/trunk/drivers/staging/dt3155/Makefile
+++ b/trunk/drivers/staging/dt3155/Makefile
@@ -1,27 +1,6 @@
-
-ifeq ($(shell [[ `uname -r | cut -f 1,2 -d\.` < 2.6 ]] && echo pre2.6),pre2.6)
-# system with a pre 2.6 kernel _don't_ use kbuild.
-all:
-	$(MAKE) -f Makefile.pre-2.6
-
-clean:
-	rm -f *.o
-
-else
-# systems with a 2.6 or later kernel use kbuild.
-ifneq ($(KERNELRELEASE),)
-obj-m	:= dt3155.o
-dt3155-objs := dt3155_drv.o dt3155_isr.o dt3155_io.o allocator.o
-
-else
-KDIR	:= /lib/modules/$(shell uname -r)/build
-PWD		:= $(shell pwd)
-
-all:
-	$(MAKE) -C $(KDIR) M=$(PWD) modules
-
-clean:
-	rm -rf *.o *.mod *.mod.c *.ko  .dt3155* .allocator.o.cmd  .tmp_versions
-
-endif
-endif
+obj-$(CONFIG_DT3155)	+= dt3155.o
+dt3155-objs :=	\
+		dt3155_drv.o	\
+		dt3155_isr.o	\
+		dt3155_io.o	\
+		allocator.o