---

yaml --- r: 175571 b: refs/heads/master c: bbb8461 h: refs/heads/master i: 175569: 87f276c 175567: c135f46 v: v3
git-mirror · Dec 11, 2009 · 00a3317 · 00a3317
1 parent d57893f
commit 00a3317
Show file tree

Hide file tree

Showing 4 changed files with 794 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c20a66f474e890dd8cc34e124632cd85e4165899
+refs/heads/master: bbb84619c378414118fd4f1778125cd246c71e53
diff --git a/trunk/drivers/net/can/Kconfig b/trunk/drivers/net/can/Kconfig
@@ -54,6 +54,15 @@ config CAN_MCP251X
 	---help---
 	  Driver for the Microchip MCP251x SPI CAN controllers.
 
+config CAN_BFIN
+	depends on CAN_DEV && (BF534 || BF536 || BF537 || BF538 || BF539 || BF54x)
+	tristate "Analog Devices Blackfin on-chip CAN"
+	---help---
+	  Driver for the Analog Devices Blackfin on-chip CAN controllers
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called bfin_can.
+
 source "drivers/net/can/mscan/Kconfig"
 
 source "drivers/net/can/sja1000/Kconfig"

diff --git a/trunk/drivers/net/can/Makefile b/trunk/drivers/net/can/Makefile
@@ -14,5 +14,6 @@ obj-$(CONFIG_CAN_MSCAN)		+= mscan/
 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
 
 ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG