summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c1
-rw-r--r--arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c1
-rw-r--r--arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c1
-rw-r--r--arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c2
-rw-r--r--arch/arm/mach-uniphier/boot-mode/boot-mode.c1
-rw-r--r--arch/arm/mach-uniphier/init/init-ph1-ld4.c1
-rw-r--r--arch/arm/mach-uniphier/init/init-ph1-pro4.c1
-rw-r--r--arch/arm/mach-uniphier/init/init-ph1-pro5.c1
-rw-r--r--arch/arm/mach-uniphier/init/init-ph1-sld3.c1
-rw-r--r--arch/arm/mach-uniphier/init/init-ph1-sld8.c1
-rw-r--r--arch/arm/mach-uniphier/init/init-proxstream2.c1
-rw-r--r--arch/arm/mach-uniphier/lowlevel_init.S2
-rw-r--r--arch/arm/mach-uniphier/micro-support-card.c1
13 files changed, 0 insertions, 15 deletions
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 f974d9f08d1..c04895ae655 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 c68cb59fc0c..004e2fba0b5 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 c943e12db15..66c1764b548 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 10a47c6fccf..8c5b095e955 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 c6cafa7919c..26fc9b0a9f0 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 8d0ef0389e1..bab120466cc 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 b9ce08d88f9..478c801332a 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 92b3f21d93c..cd6313a04fa 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 1146fdab977..512d66d1b6c 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 741e88c212f..5827e6da73d 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 8d03b8f86a0..71d36d94e6e 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 5936045e866..1a2222d9d28 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 4c34748c25c..9c2483fb914 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;