diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-14 20:47:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 11:00:53 -0700 |
| commit | 936b6230530a3605e99563dfd3a6845dc0343b6e (patch) | |
| tree | 7ad4d217b6fd090c8d4fc79d5030b8ce50726f7a /drivers/staging | |
| parent | 84a209d01c58d74f291efc82e313b132ecec7be0 (diff) | |
Staging: cpc-usb: add driver to the build
This adds the cpc-usb driver to the kernel build
Cc: Sebastian Haas <haas@ems-wuensche.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/cpc-usb/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/staging/cpc-usb/Makefile | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index f634fcf3e5a..f9371ab9d08 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -121,5 +121,7 @@ source "drivers/staging/octeon/Kconfig" source "drivers/staging/vt6655/Kconfig" +source "drivers/staging/cpc-usb/Kconfig" + endif # !STAGING_EXCLUDE_BUILD endif # STAGING diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 52f8eb99afd..d6bafe2ff9c 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -42,3 +42,4 @@ obj-$(CONFIG_LINE6_USB) += line6/ obj-$(CONFIG_USB_SERIAL_QUATECH_ESU100) += serqt_usb/ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ obj-$(CONFIG_VT6655) += vt6655/ +obj-$(CONFIG_USB_CPC) += cpc-usb/ diff --git a/drivers/staging/cpc-usb/Kconfig b/drivers/staging/cpc-usb/Kconfig new file mode 100644 index 00000000000..00924ce8195 --- /dev/null +++ b/drivers/staging/cpc-usb/Kconfig @@ -0,0 +1,4 @@ +config USB_CPC + tristate "CPC CAN USB driver" + depends on USB + default n diff --git a/drivers/staging/cpc-usb/Makefile b/drivers/staging/cpc-usb/Makefile new file mode 100644 index 00000000000..3f83170a8fa --- /dev/null +++ b/drivers/staging/cpc-usb/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_USB_CPC) += cpc-usb.o + +cpc-usb-y := cpc-usb_drv.o sja2m16c_2.o |