aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-11-16 09:51:20 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-16 09:51:20 -0500
commit0a5709b2dc84140082ea235130a05c05d51f94a2 (patch)
tree096bdbc0a86fde503722611bba1feaca76e91d3a /arch
parentce07d90aa80a4c9a956eb2f662e4be5ea5c6baf8 (diff)
[ARM] Include asm/hardware.h instead of asm/arch/hardware.h
Rationalise hardware.h include. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/corgi_lcd.c2
-rw-r--r--arch/arm/plat-omap/dmtimer.c2
-rw-r--r--arch/arm/plat-omap/ocpi.c2
-rw-r--r--arch/arm/plat-omap/pm.c2
-rw-r--r--arch/arm/plat-omap/sram-fn.S2
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c
index 698eb06545c4..6dbcaf114ad7 100644
--- a/arch/arm/mach-pxa/corgi_lcd.c
+++ b/arch/arm/mach-pxa/corgi_lcd.c
@@ -22,7 +22,7 @@
22#include <linux/string.h> 22#include <linux/string.h>
23#include <asm/arch/akita.h> 23#include <asm/arch/akita.h>
24#include <asm/arch/corgi.h> 24#include <asm/arch/corgi.h>
25#include <asm/arch/hardware.h> 25#include <asm/hardware.h>
26#include <asm/arch/pxa-regs.h> 26#include <asm/arch/pxa-regs.h>
27#include <asm/arch/sharpsl.h> 27#include <asm/arch/sharpsl.h>
28#include <asm/arch/spitz.h> 28#include <asm/arch/spitz.h>
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index a1468d7326eb..38d7ebf87920 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28#include <linux/init.h> 28#include <linux/init.h>
29#include <asm/arch/hardware.h> 29#include <asm/hardware.h>
30#include <asm/arch/dmtimer.h> 30#include <asm/arch/dmtimer.h>
31#include <asm/io.h> 31#include <asm/io.h>
32#include <asm/arch/irqs.h> 32#include <asm/arch/irqs.h>
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index 2ede2ee8cae4..b86148227480 100644
--- a/arch/arm/plat-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -34,7 +34,7 @@
34 34
35#include <asm/io.h> 35#include <asm/io.h>
36#include <asm/hardware/clock.h> 36#include <asm/hardware/clock.h>
37#include <asm/arch/hardware.h> 37#include <asm/hardware.h>
38 38
39#define OCPI_BASE 0xfffec320 39#define OCPI_BASE 0xfffec320
40#define OCPI_FAULT (OCPI_BASE + 0x00) 40#define OCPI_FAULT (OCPI_BASE + 0x00)
diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index 966cca031ca7..1a24e2c10714 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -509,7 +509,7 @@ static void omap_pm_init_proc(void)
509 * @state: suspend state we're entering. 509 * @state: suspend state we're entering.
510 * 510 *
511 */ 511 */
512//#include <asm/arch/hardware.h> 512//#include <asm/hardware.h>
513 513
514static int omap_pm_prepare(suspend_state_t state) 514static int omap_pm_prepare(suspend_state_t state)
515{ 515{
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S
index 4bea36964a00..66414cc8e6e3 100644
--- a/arch/arm/plat-omap/sram-fn.S
+++ b/arch/arm/plat-omap/sram-fn.S
@@ -12,7 +12,7 @@
12#include <linux/linkage.h> 12#include <linux/linkage.h>
13#include <asm/assembler.h> 13#include <asm/assembler.h>
14#include <asm/arch/io.h> 14#include <asm/arch/io.h>
15#include <asm/arch/hardware.h> 15#include <asm/hardware.h>
16 16
17 .text 17 .text
18 18