---

yaml --- r: 325400 b: refs/heads/master c: 2d96650 h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · f10112b · f10112b
1 parent bcde469
commit f10112b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -138,4 +138,6 @@ source "drivers/staging/ramster/Kconfig"

		source "drivers/staging/silicom/Kconfig"

		source "drivers/staging/ced1401/Kconfig"

		endif # STAGING