diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 04:24:53 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-17 04:24:53 +0400 |
commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/can/Makefile | |
parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
download | linux-492b057c426e4aa747484958e18e9da29003985d.tar.xz |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/can/Makefile')
-rw-r--r-- | drivers/net/can/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile index c4bead705cd9..523a941b358b 100644 --- a/drivers/net/can/Makefile +++ b/drivers/net/can/Makefile @@ -3,3 +3,10 @@ # obj-$(CONFIG_CAN_VCAN) += vcan.o + +obj-$(CONFIG_CAN_DEV) += can-dev.o +can-dev-y := dev.o + +obj-$(CONFIG_CAN_SJA1000) += sja1000/ + +ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG |