Merge branch 'for-2.6.23' into merge

[linux-2.6-omap-h63xx.git] / arch / arm / boot / compressed / head-l7200.S

diff --git a/arch/arm/boot/compressed/head-l7200.S b/arch/arm/boot/compressed/head-l7200.S
index b08bd23f8d1639ab291658b71290ea8cf27369a5..d0e3b20856cd4657170b13f85d6111dee1ec5d65 100644 (file)
--- a/arch/arm/boot/compressed/head-l7200.S
+++ b/arch/arm/boot/compressed/head-l7200.S
@@ -7,7 +7,6 @@
  * is merged with head.S by the linker.
  */
 
-#include <linux/config.h>
 #include <asm/mach-types.h>
 
 #ifndef CONFIG_ARCH_L7200