---

yaml --- r: 278293 b: refs/heads/master c: de56566 h: refs/heads/master i: 278291: a046574 v: v3
git-mirror · Nov 30, 2011 · b7f2927 · b7f2927
1 parent 0f74b11
commit b7f2927
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 1,505 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec2a5466b3ce680c92e8e05617b020fd825854b9
+refs/heads/master: de565664041d954b60f87e3d576a784cf25672d0
diff --git a/trunk/drivers/net/can/Kconfig b/trunk/drivers/net/can/Kconfig
@@ -116,8 +116,6 @@ 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,7 +14,6 @@ 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
diff --git a/trunk/drivers/net/can/cc770/Makefile b/trunk/drivers/net/can/cc770/Makefile