diff options
Diffstat (limited to 'arch/arm/mach-mv78xx0')
| -rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/memory.h | 10 | ||||
| -rw-r--r-- | arch/arm/mach-mv78xx0/irq.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-mv78xx0/mpp.c | 3 |
4 files changed, 3 insertions, 15 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S index 04891428e48b..a7df02b049b7 100644 --- a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S +++ b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <mach/mv78xx0.h> | 9 | #include <mach/mv78xx0.h> |
| 10 | 10 | ||
| 11 | .macro addruart, rp, rv | 11 | .macro addruart, rp, rv, tmp |
| 12 | ldr \rp, =MV78XX0_REGS_PHYS_BASE | 12 | ldr \rp, =MV78XX0_REGS_PHYS_BASE |
| 13 | ldr \rv, =MV78XX0_REGS_VIRT_BASE | 13 | ldr \rv, =MV78XX0_REGS_VIRT_BASE |
| 14 | orr \rp, \rp, #0x00012000 | 14 | orr \rp, \rp, #0x00012000 |
diff --git a/arch/arm/mach-mv78xx0/include/mach/memory.h b/arch/arm/mach-mv78xx0/include/mach/memory.h deleted file mode 100644 index a648c51f2e42..000000000000 --- a/arch/arm/mach-mv78xx0/include/mach/memory.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-mv78xx0/include/mach/memory.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 6 | #define __ASM_ARCH_MEMORY_H | ||
| 7 | |||
| 8 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
| 9 | |||
| 10 | #endif | ||
diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c index 3e24431bb5ea..e421b701663b 100644 --- a/arch/arm/mach-mv78xx0/irq.c +++ b/arch/arm/mach-mv78xx0/irq.c | |||
| @@ -7,12 +7,11 @@ | |||
| 7 | * License version 2. This program is licensed "as is" without any | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | #include <linux/gpio.h> | |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <linux/irq.h> | 14 | #include <linux/irq.h> |
| 15 | #include <asm/gpio.h> | ||
| 16 | #include <mach/bridge-regs.h> | 15 | #include <mach/bridge-regs.h> |
| 17 | #include <plat/irq.h> | 16 | #include <plat/irq.h> |
| 18 | #include "common.h" | 17 | #include "common.h" |
diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c index 59b7686b9209..cf4e494d44bf 100644 --- a/arch/arm/mach-mv78xx0/mpp.c +++ b/arch/arm/mach-mv78xx0/mpp.c | |||
| @@ -7,13 +7,12 @@ | |||
| 7 | * License version 2. This program is licensed "as is" without any | 7 | * License version 2. This program is licensed "as is" without any |
| 8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
| 9 | */ | 9 | */ |
| 10 | 10 | #include <linux/gpio.h> | |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <plat/mpp.h> | 15 | #include <plat/mpp.h> |
| 16 | #include <asm/gpio.h> | ||
| 17 | #include <mach/hardware.h> | 16 | #include <mach/hardware.h> |
| 18 | #include "common.h" | 17 | #include "common.h" |
| 19 | #include "mpp.h" | 18 | #include "mpp.h" |