From 65d0e51a10f7911ecb6719fe0b548f09cf63dc92 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 28 Nov 2008 16:13:44 +0000 Subject: [PATCH] --- yaml --- r: 123579 b: refs/heads/master c: 326878173bd352f968c958a4936fc2bc3540becd h: refs/heads/master i: 123577: 983c357af05f4cb0e420b9a26867c2ff49dbe83d 123575: 891ae2f5afa121e741a5cdd04df1c0c6e08d93b7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-footbridge/include/mach/hardware.h | 3 --- trunk/arch/arm/mach-footbridge/include/mach/io.h | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 676d83121a65..f15156f29f5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 325045fa5358536edc0cc788ec32e9e2409ff0b1 +refs/heads/master: 326878173bd352f968c958a4936fc2bc3540becd diff --git a/trunk/arch/arm/mach-footbridge/include/mach/hardware.h b/trunk/arch/arm/mach-footbridge/include/mach/hardware.h index ffaea90486f9..66426ebfb918 100644 --- a/trunk/arch/arm/mach-footbridge/include/mach/hardware.h +++ b/trunk/arch/arm/mach-footbridge/include/mach/hardware.h @@ -28,9 +28,6 @@ #define XBUS_SIZE 0x00100000 #define XBUS_BASE 0xff800000 -#define PCIO_SIZE 0x00100000 -#define PCIO_BASE 0xff000000 - #define ARMCSR_SIZE 0x00100000 #define ARMCSR_BASE 0xfe000000 diff --git a/trunk/arch/arm/mach-footbridge/include/mach/io.h b/trunk/arch/arm/mach-footbridge/include/mach/io.h index a7b066239996..101a4fe90bde 100644 --- a/trunk/arch/arm/mach-footbridge/include/mach/io.h +++ b/trunk/arch/arm/mach-footbridge/include/mach/io.h @@ -14,7 +14,8 @@ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H -#include +#define PCIO_SIZE 0x00100000 +#define PCIO_BASE 0xff000000 #define IO_SPACE_LIMIT 0xffff