[ARM] Fix up includes

Remove duplicate includes, ensure that linux/config.h is included
where necessary, and linux/config.h isn't included where it isn't
needed.

13 files changed, 12 insertions, 6 deletions

diff --git a/include/asm-arm/arch-iop3xx/iop321-irqs.h b/include/asm-arm/arch-iop3xx/iop321-irqs.h
index 6e757b819105..9d5518da56fc 100644
--- a/include/asm-arm/arch-iop3xx/iop321-irqs.h
+++ b/include/asm-arm/arch-iop3xx/iop321-irqs.h
@@ -10,6 +10,7 @@
  *
  */
 
+#include <linux/config.h>
 
 /*
  * IOP80321 chipset interrupts
diff --git a/include/asm-arm/arch-iop3xx/irqs.h b/include/asm-arm/arch-iop3xx/irqs.h
index 7468fab71d94..1df33024c8ea 100644
--- a/include/asm-arm/arch-iop3xx/irqs.h
+++ b/include/asm-arm/arch-iop3xx/irqs.h
@@ -10,6 +10,8 @@
  *
  */
 
+#include <linux/config.h>
+
 /*
  * Whic iop3xx implementation is this?
  */
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index 9faf4e77b305..638bd35d7964 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -13,7 +13,6 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <linux/config.h>
 #include <asm/mach-types.h>
 
 
diff --git a/include/asm-arm/arch-pxa/ide.h b/include/asm-arm/arch-pxa/ide.h
index 926797e14a06..71a2e11b0206 100644
--- a/include/asm-arm/arch-pxa/ide.h
+++ b/include/asm-arm/arch-pxa/ide.h
@@ -14,7 +14,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <asm/irq.h>
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
diff --git a/include/asm-arm/arch-pxa/idp.h b/include/asm-arm/arch-pxa/idp.h
index 63932060242e..e496ed7f496a 100644
--- a/include/asm-arm/arch-pxa/idp.h
+++ b/include/asm-arm/arch-pxa/idp.h
@@ -12,6 +12,7 @@
  *
  */
 
+#include <linux/config.h>
 
 /*
  * Note: this file must be safe to include in assembly files
diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h
index 6d452434eabc..ba16af5ee41a 100644
--- a/include/asm-arm/arch-pxa/irqs.h
+++ b/include/asm-arm/arch-pxa/irqs.h
@@ -10,6 +10,8 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/config.h>
+
 #define PXA_IRQ_SKIP	7	/* The first 7 IRQs are not yet used */
 #define PXA_IRQ(x)		((x) - PXA_IRQ_SKIP)
 
diff --git a/include/asm-arm/arch-pxa/keyboard.h b/include/asm-arm/arch-pxa/keyboard.h
index 8cd10f1aa231..7bec3179b189 100644
--- a/include/asm-arm/arch-pxa/keyboard.h
+++ b/include/asm-arm/arch-pxa/keyboard.h
@@ -7,7 +7,6 @@
 #ifndef _PXA_KEYBOARD_H
 #define _PXA_KEYBOARD_H
 
-#include <linux/config.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index 1823479b1057..15b8ddd50065 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/config.h>
 
 // FIXME hack so that SA-1111.h will work [cb]
 
diff --git a/include/asm-arm/arch-sa1100/serial.h b/include/asm-arm/arch-sa1100/serial.h
index 74ebcd5c669c..a6a2267a2dfa 100644
--- a/include/asm-arm/arch-sa1100/serial.h
+++ b/include/asm-arm/arch-sa1100/serial.h
@@ -7,6 +7,8 @@
  * This is included by serial.c -- serial_sa1100.c makes no use of it.
  */
 
+#include <linux/config.h>
+
 /* Standard COM flags */
 #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
 
diff --git a/include/asm-arm/arch-sa1100/trizeps.h b/include/asm-arm/arch-sa1100/trizeps.h
index b9cc02bac5d9..1802947011be 100644
--- a/include/asm-arm/arch-sa1100/trizeps.h
+++ b/include/asm-arm/arch-sa1100/trizeps.h
@@ -13,6 +13,8 @@
 #ifndef _ASM_ARCH_TRIZEPS_H_
 #define _ASM_ARCH_TRIZEPS_H_
 
+#include <linux/config.h>
+
 #ifdef CONFIG_TRIZEPS_MFTB2
 #include "mftb2.h"
 #endif
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index 30a47cba4d4b..cff6d6f05913 100644
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@ -10,6 +10,7 @@
 #ifndef _ASMARM_CACHEFLUSH_H
 #define _ASMARM_CACHEFLUSH_H
 
+#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 
diff --git a/include/asm-arm/mmu.h b/include/asm-arm/mmu.h
index c33797d6cc7b..a457cb71984f 100644
--- a/include/asm-arm/mmu.h
+++ b/include/asm-arm/mmu.h
@@ -1,8 +1,6 @@
 #ifndef __ARM_MMU_H
 #define __ARM_MMU_H
 
-#include <linux/config.h>
-
 typedef struct {
 #if __LINUX_ARM_ARCH__ >= 6
 	unsigned int id;
diff --git a/include/asm-arm/pgtable.h b/include/asm-arm/pgtable.h
index 5b23a0a59778..9a09fb19258b 100644
--- a/include/asm-arm/pgtable.h
+++ b/include/asm-arm/pgtable.h
@@ -10,7 +10,6 @@
 #ifndef _ASMARM_PGTABLE_H
 #define _ASMARM_PGTABLE_H
 
-#include <linux/config.h>
 #include <asm/memory.h>
 #include <asm/proc-fns.h>
 #include <asm/arch/vmalloc.h>