Add changes from the Linux-2.6 tree.

[linux-2.6.git] / include / asm-arm / hardware / dec21285.h

diff --git a/include/asm-arm/hardware/dec21285.h b/include/asm-arm/hardware/dec21285.h
index 9049f0d..546f707 100644 (file)
--- a/include/asm-arm/hardware/dec21285.h
+++ b/include/asm-arm/hardware/dec21285.h
@@ -18,9 +18,8 @@
 #define DC21285_PCI_IO                 0x7c000000
 #define DC21285_PCI_MEM                        0x80000000
 
-#include <linux/config.h>
 #ifndef __ASSEMBLY__
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #define DC21285_IO(x)          ((volatile unsigned long *)(ARMCSR_BASE+(x)))
 #else
 #define DC21285_IO(x)          (x)