]> err.no Git - linux-2.6/commitdiff
[ARM] Include asm/hardware.h instead of asm/arch/hardware.h
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 16 Nov 2005 14:51:20 +0000 (14:51 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 16 Nov 2005 14:51:20 +0000 (14:51 +0000)
Rationalise hardware.h include.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
19 files changed:
arch/arm/mach-pxa/corgi_lcd.c
arch/arm/plat-omap/dmtimer.c
arch/arm/plat-omap/ocpi.c
arch/arm/plat-omap/pm.c
arch/arm/plat-omap/sram-fn.S
include/asm-arm/arch-clps711x/uncompress.h
include/asm-arm/arch-epxa10db/uncompress.h
include/asm-arm/arch-h720x/uncompress.h
include/asm-arm/arch-imx/irqs.h
include/asm-arm/arch-imx/timex.h
include/asm-arm/arch-integrator/smp.h
include/asm-arm/arch-l7200/aux_reg.h
include/asm-arm/arch-l7200/gp_timers.h
include/asm-arm/arch-omap/gpio.h
include/asm-arm/arch-omap/irqs.h
include/asm-arm/arch-omap/mcbsp.h
include/asm-arm/arch-omap/system.h
include/asm-arm/arch-rpc/system.h
include/asm-arm/hardware/dec21285.h

index 698eb06545c43c3ee5461fe5133139046af84a7a..6dbcaf114ad782a00907b15672f9ae60aff0dfea 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/string.h>
 #include <asm/arch/akita.h>
 #include <asm/arch/corgi.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/sharpsl.h>
 #include <asm/arch/spitz.h>
index a1468d7326eb5b4485c516b40c29ce428ef36639..38d7ebf879207cb116ed17fc1c81e2b1ab7ec946 100644 (file)
@@ -26,7 +26,7 @@
  */
 
 #include <linux/init.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/dmtimer.h>
 #include <asm/io.h>
 #include <asm/arch/irqs.h>
index 2ede2ee8cae420ecf4b5a24593e572058c942929..b86148227480607686bddbd40dbec8c31d11880b 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <asm/io.h>
 #include <asm/hardware/clock.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
 #define OCPI_BASE              0xfffec320
 #define OCPI_FAULT             (OCPI_BASE + 0x00)
index 966cca031ca7460f6ad7deb75e70463d68127aaa..1a24e2c10714e498942cdaae1d3386af6f9f7b37 100644 (file)
@@ -509,7 +509,7 @@ static void omap_pm_init_proc(void)
  *     @state:         suspend state we're entering.
  *
  */
-//#include <asm/arch/hardware.h>
+//#include <asm/hardware.h>
 
 static int omap_pm_prepare(suspend_state_t state)
 {
index 4bea36964a005faa91a16c88cfa0550c3e449cc6..66414cc8e6e38650da20a9447eaa34fd09b28b21 100644 (file)
@@ -12,7 +12,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/arch/io.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
        .text
 
index 7d0ab791b16cffd46856f4e1f542c9acd9e2d608..9fc4bcfa1681666126e1b7e8cf5b004324cd70fa 100644 (file)
@@ -19,7 +19,7 @@
  */
 #include <linux/config.h>
 #include <asm/arch/io.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/hardware/clps7111.h>
 
 #undef CLPS7111_BASE
index d33ad6a93749138aafdbefdef416e100a0f2c02e..fdfe0e6848f871e9488330ef3d7bb6973b3d5eca 100644 (file)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include "asm/arch/platform.h"
-#include "asm/arch/hardware.h"
+#include "asm/hardware.h"
 #define UART00_TYPE (volatile unsigned int*)
 #include "asm/arch/uart00.h"
 
index 2fffacf85a0101cf8d41abdd8caf4d19987c6f88..9535764bcc715705263995a201491265202ece0c 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_UNCOMPRESS_H
 #define __ASM_ARCH_UNCOMPRESS_H
 
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
 #define LSR    0x14
 #define TEMPTY         0x40
index 238197cfb9d964a378a7e4602ff90d1970d88240..f195542898e082267f155cb718d9717b86ded4a4 100644 (file)
@@ -23,7 +23,7 @@
 #define __ARM_IRQS_H__
 
 /* Use the imx definitions */
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
 /*
  *  IMX Interrupt numbers
index d65ab3cd5d5d2d6152dd7f53e717eb4bc4c06a44..8c91674706b1f276e4a08e0f3ba0b73a1a8ef24b 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef __ASM_ARCH_TIMEX_H
 #define __ASM_ARCH_TIMEX_H
 
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #define CLOCK_TICK_RATE                (CLK32)
 
 #endif
index 0ec7093f7c3701122f1043de8666fdcf56bf67cf..da6981efdc394057840030d6503bcd34ecfc446a 100644 (file)
@@ -3,7 +3,7 @@
 
 #include <linux/config.h>
 
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 
 #define hard_smp_processor_id()                                \
index 762cbc76c5017c6d449906ef08abef8e0799ad5a..5b4396de16a0319a4ad80b82767a99461f4d1f16 100644 (file)
@@ -9,7 +9,7 @@
 #ifndef _ASM_ARCH_AUXREG_H
 #define _ASM_ARCH_AUXREG_H
 
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
 #define l7200aux_reg   *((volatile unsigned int *) (AUX_BASE))
 
index 6f20962df2480a5961158cbe7cae1bfeb835181f..9c4804d13578aa7784c5b1a3d86cff0c5ebb1ce4 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef _ASM_ARCH_GPTIMERS_H
 #define _ASM_ARCH_GPTIMERS_H
 
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
 /*
  * Layout of L7200 general purpose timer registers
index 1b3885741ac1ca05f83cdbf9a7b8090c7cd11c13..f486b72070eab1b39893264a5730186ca33397f9 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef __ASM_ARCH_OMAP_GPIO_H
 #define __ASM_ARCH_OMAP_GPIO_H
 
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/irqs.h>
 #include <asm/io.h>
 
index 9779686bdcebbe412f5ece3648ccb552e7f8a6e3..4ffce1d777591ab7e64e2a81951db78fcb768213 100644 (file)
@@ -260,7 +260,7 @@ extern void omap_init_irq(void);
  * The definition of NR_IRQS is in board-specific header file, which is
  * included via hardware.h
  */
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
 #ifndef NR_IRQS
 #define NR_IRQS                 IH_BOARD_BASE
index 305bdeb16ab881d550db09aaadd970fae4119484..e79d98ab2ab63ac281ceaa1177862789a63eae8d 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef __ASM_ARCH_OMAP_MCBSP_H
 #define __ASM_ARCH_OMAP_MCBSP_H
 
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 
 #define OMAP730_MCBSP1_BASE    0xfffb1000
 #define OMAP730_MCBSP2_BASE    0xfffb1800
index b43cdd2a3874d7ead25b237d2b1c30d18512bfca..9af415d2944a57ba77b89215668158c143c8cb01 100644 (file)
@@ -7,7 +7,7 @@
 #include <linux/config.h>
 #include <asm/mach-types.h>
 #include <asm/hardware/clock.h>
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/arch/prcm.h>
 
 #ifndef CONFIG_MACH_VOICEBLUE
index ca3277d1d5ea43ce64befa127c72b40f3d8b4342..729c2ae4b513fbbaa123c4448d10305f924e07d9 100644 (file)
@@ -7,7 +7,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <asm/arch/hardware.h>
+#include <asm/hardware.h>
 #include <asm/hardware/iomd.h>
 #include <asm/io.h>
 
index 9049f0ddaecf5cfcb10ebc41d020c5449ffc18b4..6685e3fb97b1fe7afece91656f0fb6ede8bbfc83 100644 (file)
@@ -20,7 +20,7 @@
 
 #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)