Merge ../linus

[linux-2.6] / include / asm-arm / arch-clps711x / hardware.h

diff --git a/include/asm-arm/arch-clps711x/hardware.h b/include/asm-arm/arch-clps711x/hardware.h
index 1386871e1a5afa61505ebdf14b3632e11dadbeda..0fdbe72fff2afc7a9f50030fa2d942eb13767c67 100644 (file)
--- a/include/asm-arm/arch-clps711x/hardware.h
+++ b/include/asm-arm/arch-clps711x/hardware.h
@@ -22,7 +22,6 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <linux/config.h>
 
 #define CLPS7111_VIRT_BASE     0xff000000
 #define CLPS7111_BASE          CLPS7111_VIRT_BASE