summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-02-01 19:38:49 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-02-01 19:38:49 +0900
commit17292ecc07857bb16737c340dda289ab9d219e05 (patch)
tree214a208af0e4826b835cd4ee770c7f1573c86b04 /drivers/net/can/Makefile
parentcd7bb53ff88a5acef942a87c1d04e6211b6470dc (diff)
parent0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff)
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'drivers/net/can/Makefile')
-rw-r--r--drivers/net/can/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile
index 07ca159ba3f..53c82a71778 100644
--- a/drivers/net/can/Makefile
+++ b/drivers/net/can/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_CAN_DEV) += can-dev.o
can-dev-y := dev.o
obj-y += usb/
+obj-y += softing/
obj-$(CONFIG_CAN_SJA1000) += sja1000/
obj-$(CONFIG_CAN_MSCAN) += mscan/