From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 Sep 2012 02:43:33 +0000 (-0700)
Subject: Staging: ced1401: add driver to the build
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2d96650139bf6f163970f72ef8aa1abaa6c8b3d1;p=deliverable%2Flinux.git

Staging: ced1401: add driver to the build

This adds the ced1401 driver to the build system.

Yes, there are a lot of warning messages, but it does compile, so it
should be good to get going.

Cc: Alois Schlögl <alois.schloegl@ist.ac.at>
Cc: Greg P. Smith <greg@ced.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 08d279f8816e..025d8c98424a 100644
--- a/drivers/staging/Kconfig
+++ b/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/drivers/staging/Makefile b/drivers/staging/Makefile
index 0f04a28c8892..08e9667a4e45 100644
--- a/drivers/staging/Makefile
+++ b/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/drivers/staging/ced1401/Kconfig b/drivers/staging/ced1401/Kconfig
new file mode 100644
index 000000000000..ae36d1b2ba99
--- /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 6acb03122bd2..f0c114b2b4b9 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