From da1730d36c68e8fb44eabc895f901f9040445dab Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Thu, 9 Apr 2009 20:36:57 +0800
Subject: [PATCH] --- yaml --- r: 143546 b: refs/heads/master c:
 6845a658e09767e72c12558825ed66a9eda02737 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-pxa/em-x270.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a317b9ebfef4..47b6b48d170c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd9d074098afb5f8693306d22aaf005bfb50d8f7
+refs/heads/master: 6845a658e09767e72c12558825ed66a9eda02737
diff --git a/trunk/arch/arm/mach-pxa/em-x270.c b/trunk/arch/arm/mach-pxa/em-x270.c
index de40f169521b..bc0f73fbd4ca 100644
--- a/trunk/arch/arm/mach-pxa/em-x270.c
+++ b/trunk/arch/arm/mach-pxa/em-x270.c
@@ -28,7 +28,6 @@
 #include <linux/spi/libertas_spi.h>
 #include <linux/power_supply.h>
 #include <linux/apm-emulation.h>
-#include <linux/delay.h>
 
 #include <media/soc_camera.h>