diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 08d279f..025d8c9 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -138,4 +138,6 @@
 
 source "drivers/staging/silicom/Kconfig"
 
+source "drivers/staging/ced1401/Kconfig"
+
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 0f04a28..08e9667 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -61,3 +61,4 @@
 obj-$(CONFIG_OMAP_BANDGAP)	+= omap-thermal/
 obj-$(CONFIG_ZCACHE2)		+= ramster/
 obj-$(CONFIG_NET_VENDOR_SILICOM)	+= silicom/
+obj-$(CONFIG_CED1401)		+= ced1401/
diff --git a/drivers/staging/ced1401/Kconfig b/drivers/staging/ced1401/Kconfig
new file mode 100644
index 0000000..ae36d1b
--- /dev/null
+++ b/drivers/staging/ced1401/Kconfig
@@ -0,0 +1,6 @@
+config CED1401
+	tristate "Cambridge Electronic Design 1401 USB support"
+	depends on USB
+	help
+	  This driver supports the Cambridge Electronic Design 1401 USB device
+	  (whatever that is.)
diff --git a/drivers/staging/ced1401/Makefile b/drivers/staging/ced1401/Makefile
index 6acb031..f0c114b 100644
--- a/drivers/staging/ced1401/Makefile
+++ b/drivers/staging/ced1401/Makefile
@@ -1,12 +1,3 @@
-obj-m := cedusb.o
-cedusb-objs := usb1401.o ced_ioc.o
-KDIR := /lib/modules/$(shell uname -r)/build
-PWD := $(shell pwd)
-KBUILD_EXTRA_SYMBOLS := $(PWD)
-EXTRA_CFLAGS = -I$(HOME)/src/ced1401 
-all:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
 
-clean:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
-
+obj-$(CONFIG_CED1401)	:= cedusb.o
+cedusb-objs	:= usb1401.o ced_ioc.o