Merge branch 'master' into 83xx

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-sa1100 / hardware.h

diff --git a/include/asm-arm/arch-sa1100/hardware.h b/include/asm-arm/arch-sa1100/hardware.h
index ee008a5484f316a64afc59046985b9e48f0e1d66..1abd7cfc8bcef4817cc19eaa2573ee18dcf5695a 100644 (file)
--- a/include/asm-arm/arch-sa1100/hardware.h
+++ b/include/asm-arm/arch-sa1100/hardware.h
@@ -12,7 +12,6 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <linux/config.h>
 
 #define UNCACHEABLE_ADDR       0xfa050000