---

yaml --- r: 278315 b: refs/heads/master c: 2a367c3 h: refs/heads/master i: 278313: 61872cc 278311: c046171 v: v3
git-mirror · Dec 1, 2011 · cb64d0f · cb64d0f
1 parent 53a6c89
commit cb64d0f
Show file tree

Hide file tree

Showing 8 changed files with 1,131 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7d75960ea74e524d75ba8b067523471f39a7bf3
+refs/heads/master: 2a367c3a82557cd11a04949ef2160658987fa772
diff --git a/trunk/drivers/net/can/Kconfig b/trunk/drivers/net/can/Kconfig
@@ -116,6 +116,8 @@ source "drivers/net/can/sja1000/Kconfig"
 
 source "drivers/net/can/c_can/Kconfig"
 
+source "drivers/net/can/cc770/Kconfig"
+
 source "drivers/net/can/usb/Kconfig"
 
 source "drivers/net/can/softing/Kconfig"

diff --git a/trunk/drivers/net/can/Makefile b/trunk/drivers/net/can/Makefile
@@ -14,6 +14,7 @@ obj-y				+= softing/
 obj-$(CONFIG_CAN_SJA1000)	+= sja1000/
 obj-$(CONFIG_CAN_MSCAN)		+= mscan/
 obj-$(CONFIG_CAN_C_CAN)		+= c_can/
+obj-$(CONFIG_CAN_CC770)		+= cc770/
 obj-$(CONFIG_CAN_AT91)		+= at91_can.o
 obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o
 obj-$(CONFIG_CAN_MCP251X)	+= mcp251x.o

diff --git a/trunk/drivers/net/can/cc770/Kconfig b/trunk/drivers/net/can/cc770/Kconfig
@@ -0,0 +1,3 @@
+menuconfig CAN_CC770
+	tristate "Bosch CC770 and Intel AN82527 devices"
+	depends on CAN_DEV && HAS_IOMEM
diff --git a/trunk/drivers/net/can/cc770/Makefile b/trunk/drivers/net/can/cc770/Makefile
@@ -0,0 +1,7 @@
+#
+#  Makefile for the Bosch CC770 CAN controller drivers.
+#
+
+obj-$(CONFIG_CAN_CC770) += cc770.o
+
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG