diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 20:40:08 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-06-08 20:40:08 +0200 |
commit | 76962be8491b18ae7ff4fd6a4accd398bdb402a2 (patch) | |
tree | 976958bf8e4989a69901bfbb25dd6463728c6cb5 /drivers/net/can/Makefile | |
parent | ARM: 6166/1: Proper prefetch abort handling on pre-ARMv6 (diff) | |
parent | [ARM] pxa/spitz: Correctly register WM8750 (diff) | |
download | linux-76962be8491b18ae7ff4fd6a4accd398bdb402a2.tar.xz linux-76962be8491b18ae7ff4fd6a4accd398bdb402a2.zip |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/net/can/Makefile')
-rw-r--r-- | drivers/net/can/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/Makefile b/drivers/net/can/Makefile index 7a702f28d01c..9047cd066fea 100644 --- a/drivers/net/can/Makefile +++ b/drivers/net/can/Makefile @@ -15,5 +15,6 @@ obj-$(CONFIG_CAN_AT91) += at91_can.o obj-$(CONFIG_CAN_TI_HECC) += ti_hecc.o obj-$(CONFIG_CAN_MCP251X) += mcp251x.o obj-$(CONFIG_CAN_BFIN) += bfin_can.o +obj-$(CONFIG_CAN_JANZ_ICAN3) += janz-ican3.o ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG |