From 358faefede3b0d4c34db77b43a6688e487a6f2b1 Mon Sep 17 00:00:00 2001
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Date: Tue, 29 Jan 2013 22:23:09 +0100
Subject: [PATCH] --- yaml --- r: 355231 b: refs/heads/master c:
 63a069739a5826ab4007da88b7ec71eb9909271c h: refs/heads/master i:   355229:
 e66d6997db3ab82197674fc3c19b5b9340f225a6   355227:
 32c5b711690941835698e201514727fe5eebc86a   355223:
 be69887131b84c72787d0f89c6d00e6cf3582091   355215:
 43efe1012799584f00d26b25ff06c5ed1ce8f763   355199:
 9c67774e9fcfb4f1af78790ae4d4e11b2b0bb6a5 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/mach-dove/common.c | 29 +++++++++--------------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 35d7bdaaa0d9..a690abbb525c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92cb76254fbc818c02dbc771f296844f4ccc468c
+refs/heads/master: 63a069739a5826ab4007da88b7ec71eb9909271c
diff --git a/trunk/arch/arm/mach-dove/common.c b/trunk/arch/arm/mach-dove/common.c
index 89f4f993cd03..be887feea828 100644
--- a/trunk/arch/arm/mach-dove/common.c
+++ b/trunk/arch/arm/mach-dove/common.c
@@ -8,35 +8,24 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/pci.h>
 #include <linux/clk-provider.h>
 #include <linux/clk/mvebu.h>
-#include <linux/ata_platform.h>
-#include <linux/gpio.h>
+#include <linux/dma-mapping.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-#include <asm/timex.h>
+#include <linux/platform_data/dma-mv_xor.h>
+#include <linux/platform_data/usb-ehci-orion.h>
+#include <linux/platform_device.h>
 #include <asm/hardware/cache-tauros2.h>
+#include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/mach/pci.h>
-#include <mach/dove.h>
-#include <mach/pm.h>
 #include <mach/bridge-regs.h>
-#include <asm/mach/arch.h>
-#include <linux/irq.h>
-#include <plat/time.h>
-#include <linux/platform_data/usb-ehci-orion.h>
-#include <linux/platform_data/dma-mv_xor.h>
-#include <plat/irq.h>
+#include <mach/pm.h>
 #include <plat/common.h>
-#include <plat/addr-map.h>
+#include <plat/irq.h>
+#include <plat/time.h>
 #include "common.h"
 
 /*****************************************************************************