aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorSebastian Haas <haas@ems-wuensche.com>2009-09-16 02:04:15 +0000
committerDavid S. Miller <davem@davemloft.net>2009-09-21 11:32:24 -0700
commitc1e815c03b7313d6474164bfe91916da1329ad2b (patch)
tree79059043701d361bac72a1abc5d279453105da33 /drivers/staging/Makefile
parentcpmac: fix compilation errors against undeclared BUS_ID_SIZE (diff)
downloadlinux-dev-c1e815c03b7313d6474164bfe91916da1329ad2b.tar.xz
linux-dev-c1e815c03b7313d6474164bfe91916da1329ad2b.zip
cpc-usb: Removed driver from staging tree
This patch prepares replacing the staging driver cpc-usb with the new developed ems_usb CAN driver. Signed-off-by: Sebastian Haas <haas@ems-wuensche.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 2241ae1b21ee..ede1599e7e66 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -42,6 +42,5 @@ obj-$(CONFIG_LINE6_USB) += line6/
obj-$(CONFIG_USB_SERIAL_QUATECH2) += serqt_usb2/
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
obj-$(CONFIG_VT6655) += vt6655/
-obj-$(CONFIG_USB_CPC) += cpc-usb/
obj-$(CONFIG_RDC_17F3101X) += pata_rdc/
obj-$(CONFIG_FB_UDL) += udlfb/