浏览代码

[ARM] footbridge: avoid polluting the kernel's namespace

Avoid unnecessarily pollution of the kernel's namespace by avoiding
mach/hardware.h in mach/io.h.  Include this header file where necessary.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russell King 16 年之前
父节点
当前提交
326878173b
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 0 3
      arch/arm/mach-footbridge/include/mach/hardware.h
  2. 2 1
      arch/arm/mach-footbridge/include/mach/io.h

+ 0 - 3
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
 

+ 2 - 1
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 <mach/hardware.h>
+#define PCIO_SIZE		0x00100000
+#define PCIO_BASE		0xff000000
 
 #define IO_SPACE_LIMIT 0xffff