summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2013-01-31 17:38:38 +0000
committerJason Cooper <jason@lakedaemon.net>2013-01-31 17:38:38 +0000
commitde7c007ff6bbabb87e0ac639848eb728e2234fa2 (patch)
tree8a2d6914219c4e54cce010e90aa9041307413980 /arch/arm/mach-dove
parent36cf1ef87e9fd5658ce70b0c98f900de2609fb5f (diff)
parentb3af7a1ffd1e5e9ec536a915393b7e07a8793f2a (diff)
downloadlinux-de7c007ff6bbabb87e0ac639848eb728e2234fa2.tar.gz
linux-de7c007ff6bbabb87e0ac639848eb728e2234fa2.tar.bz2
linux-de7c007ff6bbabb87e0ac639848eb728e2234fa2.zip
Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
cleanup for v3.9 round2 - remove unneeded #includes for mach-dove - remove unneeded #includes and code for the nsa310
Diffstat (limited to 'arch/arm/mach-dove')
-rw-r--r--arch/arm/mach-dove/common.c29
1 files changed, 9 insertions, 20 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 89f4f993cd03..be887feea828 100644
--- a/arch/arm/mach-dove/common.c
+++ b/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"
/*****************************************************************************