From 9475f8de88dc397450cc28912af96595da45d5c8 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Sat, 9 Jan 2016 01:51:10 +0900
Subject: ARM: uniphier: kill bogus header includes

These includes are not necessary.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
 arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c     | 1 -
 arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c    | 1 -
 arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c    | 1 -
 arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c | 2 --
 arch/arm/mach-uniphier/boot-mode/boot-mode.c             | 1 -
 arch/arm/mach-uniphier/init/init-ph1-ld4.c               | 1 -
 arch/arm/mach-uniphier/init/init-ph1-pro4.c              | 1 -
 arch/arm/mach-uniphier/init/init-ph1-pro5.c              | 1 -
 arch/arm/mach-uniphier/init/init-ph1-sld3.c              | 1 -
 arch/arm/mach-uniphier/init/init-ph1-sld8.c              | 1 -
 arch/arm/mach-uniphier/init/init-proxstream2.c           | 1 -
 arch/arm/mach-uniphier/lowlevel_init.S                   | 2 --
 arch/arm/mach-uniphier/micro-support-card.c              | 1 -
 13 files changed, 15 deletions(-)

(limited to 'arch/arm/mach-uniphier')

diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c
index f974d9f..c04895a 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c
@@ -9,7 +9,6 @@
 #include <linux/io.h>
 #include <mach/boot-device.h>
 #include <mach/sg-regs.h>
-#include <mach/sbc-regs.h>
 
 struct boot_device_info boot_device_table[] = {
 	{BOOT_DEVICE_NAND, "NAND (Mirror 8, ECC  8, EraseSize 128KB, Addr 4)"},
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c
index c68cb59..004e2fb 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c
@@ -8,7 +8,6 @@
 #include <spl.h>
 #include <linux/io.h>
 #include <mach/boot-device.h>
-#include <mach/sbc-regs.h>
 #include <mach/sg-regs.h>
 
 static struct boot_device_info boot_device_table[] = {
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c
index c943e12..66c1764 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c
@@ -9,7 +9,6 @@
 #include <linux/io.h>
 #include <mach/boot-device.h>
 #include <mach/sg-regs.h>
-#include <mach/sbc-regs.h>
 
 static struct boot_device_info boot_device_table[] = {
 	{BOOT_DEVICE_NONE, "Reserved"},
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c
index 10a47c6..8c5b095 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c
@@ -8,8 +8,6 @@
 #include <spl.h>
 #include <linux/io.h>
 #include <mach/boot-device.h>
-#include <mach/init.h>
-#include <mach/sbc-regs.h>
 #include <mach/sg-regs.h>
 
 static struct boot_device_info boot_device_table[] = {
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
index c6cafa7..26fc9b0 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/io.h>
 #include <mach/boot-device.h>
 #include <mach/sbc-regs.h>
 #include <mach/soc_info.h>
diff --git a/arch/arm/mach-uniphier/init/init-ph1-ld4.c b/arch/arm/mach-uniphier/init/init-ph1-ld4.c
index 8d0ef03..bab1204 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-ld4.c
+++ b/arch/arm/mach-uniphier/init/init-ph1-ld4.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/compiler.h>
 #include <mach/init.h>
 #include <mach/micro-support-card.h>
 
diff --git a/arch/arm/mach-uniphier/init/init-ph1-pro4.c b/arch/arm/mach-uniphier/init/init-ph1-pro4.c
index b9ce08d..478c801 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-pro4.c
+++ b/arch/arm/mach-uniphier/init/init-ph1-pro4.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/compiler.h>
 #include <mach/init.h>
 #include <mach/micro-support-card.h>
 
diff --git a/arch/arm/mach-uniphier/init/init-ph1-pro5.c b/arch/arm/mach-uniphier/init/init-ph1-pro5.c
index 92b3f21..cd6313a 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-pro5.c
+++ b/arch/arm/mach-uniphier/init/init-ph1-pro5.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/compiler.h>
 #include <mach/init.h>
 #include <mach/micro-support-card.h>
 
diff --git a/arch/arm/mach-uniphier/init/init-ph1-sld3.c b/arch/arm/mach-uniphier/init/init-ph1-sld3.c
index 1146fda..512d66d 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-sld3.c
+++ b/arch/arm/mach-uniphier/init/init-ph1-sld3.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/compiler.h>
 #include <mach/init.h>
 #include <mach/micro-support-card.h>
 
diff --git a/arch/arm/mach-uniphier/init/init-ph1-sld8.c b/arch/arm/mach-uniphier/init/init-ph1-sld8.c
index 741e88c..5827e6d 100644
--- a/arch/arm/mach-uniphier/init/init-ph1-sld8.c
+++ b/arch/arm/mach-uniphier/init/init-ph1-sld8.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/compiler.h>
 #include <mach/init.h>
 #include <mach/micro-support-card.h>
 
diff --git a/arch/arm/mach-uniphier/init/init-proxstream2.c b/arch/arm/mach-uniphier/init/init-proxstream2.c
index 8d03b8f..71d36d9 100644
--- a/arch/arm/mach-uniphier/init/init-proxstream2.c
+++ b/arch/arm/mach-uniphier/init/init-proxstream2.c
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <spl.h>
-#include <linux/compiler.h>
 #include <mach/init.h>
 #include <mach/micro-support-card.h>
 
diff --git a/arch/arm/mach-uniphier/lowlevel_init.S b/arch/arm/mach-uniphier/lowlevel_init.S
index 5936045..1a2222d 100644
--- a/arch/arm/mach-uniphier/lowlevel_init.S
+++ b/arch/arm/mach-uniphier/lowlevel_init.S
@@ -8,8 +8,6 @@
 #include <linux/linkage.h>
 #include <linux/sizes.h>
 #include <asm/system.h>
-#include <mach/arm-mpcore.h>
-#include <mach/sbc-regs.h>
 #include <mach/ssc-regs.h>
 
 ENTRY(lowlevel_init)
diff --git a/arch/arm/mach-uniphier/micro-support-card.c b/arch/arm/mach-uniphier/micro-support-card.c
index 4c34748..9c2483f 100644
--- a/arch/arm/mach-uniphier/micro-support-card.c
+++ b/arch/arm/mach-uniphier/micro-support-card.c
@@ -70,7 +70,6 @@ int board_eth_init(bd_t *bis)
 #if !defined(CONFIG_SYS_NO_FLASH)
 
 #include <mtd/cfi_flash.h>
-#include <mach/sbc-regs.h>
 
 struct memory_bank {
 	phys_addr_t base;
-- 
cgit v1.1