diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index fc2e963e65e9ec187086078744b60e32da68a0ea..02cde3989c5ce481ef0b797b4295eba4f4df13e0 100644
--- a/drivers/staging/Kconfig
+++ b/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/drivers/staging/Makefile b/drivers/staging/Makefile
index b5e67b889f60f73808772ff85ec99343f8d18b8c..9d47d42e73cef66ba1eedae8e96cbde19ed93499 100644
--- a/drivers/staging/Makefile
+++ b/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/drivers/staging/dt3155/Kconfig b/drivers/staging/dt3155/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..4a3293c721b18de793a86e2189317bbf004e0fd3
--- /dev/null
+++ b/drivers/staging/dt3155/Kconfig
@@ -0,0 +1,4 @@
+config DT3155
+	tristate "DT3155 Digitizer support"
+	depends on PCI
+
diff --git a/drivers/staging/dt3155/Makefile b/drivers/staging/dt3155/Makefile
index 1717ffbf682f99d6c01f4473860c765acb61c677..136f21fdbbee3fa485fe0245ce489076e575a861 100644
--- a/drivers/staging/dt3155/Makefile
+++ b/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