From f10112bafddb04993d3a0cc099fbb34730c37637 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Sep 2012 19:43:33 -0700
Subject: [PATCH] --- yaml --- r: 325400 b: refs/heads/master c:
 2d96650139bf6f163970f72ef8aa1abaa6c8b3d1 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/Kconfig          |  2 ++
 trunk/drivers/staging/Makefile         |  1 +
 trunk/drivers/staging/ced1401/Kconfig  |  6 ++++++
 trunk/drivers/staging/ced1401/Makefile | 13 ++-----------
 5 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 trunk/drivers/staging/ced1401/Kconfig

diff --git a/[refs] b/[refs]
index 0be95f352c50..84e66af6139b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7fbfc825fdf183829fac42f55e1e5727f746bb0
+refs/heads/master: 2d96650139bf6f163970f72ef8aa1abaa6c8b3d1
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index 08d279f8816e..025d8c98424a 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/drivers/staging/Kconfig
@@ -138,4 +138,6 @@ source "drivers/staging/ramster/Kconfig"
 
 source "drivers/staging/silicom/Kconfig"
 
+source "drivers/staging/ced1401/Kconfig"
+
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 0f04a28c8892..08e9667a4e45 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -61,3 +61,4 @@ obj-$(CONFIG_CSR_WIFI)		+= csr/
 obj-$(CONFIG_OMAP_BANDGAP)	+= omap-thermal/
 obj-$(CONFIG_ZCACHE2)		+= ramster/
 obj-$(CONFIG_NET_VENDOR_SILICOM)	+= silicom/
+obj-$(CONFIG_CED1401)		+= ced1401/
diff --git a/trunk/drivers/staging/ced1401/Kconfig b/trunk/drivers/staging/ced1401/Kconfig
new file mode 100644
index 000000000000..ae36d1b2ba99
--- /dev/null
+++ b/trunk/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/trunk/drivers/staging/ced1401/Makefile b/trunk/drivers/staging/ced1401/Makefile
index 6acb03122bd2..f0c114b2b4b9 100644
--- a/trunk/drivers/staging/ced1401/Makefile
+++ b/trunk/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