From a6eca3d65e9ee1e769247e7a27268efa9a96d2e9 Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Fri, 22 Jul 2011 22:19:40 +0000
Subject: [PATCH] --- yaml --- r: 258560 b: refs/heads/master c:
 4570a5248bafd9d06d31ab6f6ef337c90a2a4bc0 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/can/c_can/c_can.c          | 1 -
 trunk/drivers/net/can/c_can/c_can_platform.c | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca2f0409ab6e..7b1d7999c064 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fa5ee31b4fd109536aa5745d8c6af7c3bfd6d3b
+refs/heads/master: 4570a5248bafd9d06d31ab6f6ef337c90a2a4bc0
diff --git a/trunk/drivers/net/can/c_can/c_can.c b/trunk/drivers/net/can/c_can/c_can.c
index 80adc83f796a..536bda072a16 100644
--- a/trunk/drivers/net/can/c_can/c_can.c
+++ b/trunk/drivers/net/can/c_can/c_can.c
@@ -33,7 +33,6 @@
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/list.h>
-#include <linux/delay.h>
 #include <linux/io.h>
 
 #include <linux/can.h>
diff --git a/trunk/drivers/net/can/c_can/c_can_platform.c b/trunk/drivers/net/can/c_can/c_can_platform.c
index 0e300cf840b9..0b5c6f8bdd34 100644
--- a/trunk/drivers/net/can/c_can/c_can_platform.c
+++ b/trunk/drivers/net/can/c_can/c_can_platform.c
@@ -27,7 +27,6 @@
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
 #include <linux/list.h>
-#include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>