diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-04 05:41:28 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:40:08 -0400 |
commit | be509729356b7433f73df2b9a966674a437fbbc1 (patch) | |
tree | 5a3e90513c106f9dcf08405e4ebd3599fd14413c /drivers/serial | |
parent | 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff) |
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/21285.c | 2 | ||||
-rw-r--r-- | drivers/serial/clps711x.c | 2 | ||||
-rw-r--r-- | drivers/serial/imx.c | 2 | ||||
-rw-r--r-- | drivers/serial/netx-serial.c | 2 | ||||
-rw-r--r-- | drivers/serial/pxa.c | 2 | ||||
-rw-r--r-- | drivers/serial/s3c2400.c | 2 | ||||
-rw-r--r-- | drivers/serial/s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/serial/s3c2412.c | 2 | ||||
-rw-r--r-- | drivers/serial/s3c2440.c | 2 | ||||
-rw-r--r-- | drivers/serial/sa1100.c | 2 | ||||
-rw-r--r-- | drivers/serial/samsung.c | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c index 6558a4037806..73d7773c8416 100644 --- a/drivers/serial/21285.c +++ b/drivers/serial/21285.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
21 | #include <asm/hardware/dec21285.h> | 21 | #include <asm/hardware/dec21285.h> |
22 | #include <asm/hardware.h> | 22 | #include <asm/arch/hardware.h> |
23 | 23 | ||
24 | #define BAUD_BASE (mem_fclk_21285/64) | 24 | #define BAUD_BASE (mem_fclk_21285/64) |
25 | 25 | ||
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index fc1fa9267c59..44d5d267ca17 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <linux/serial_core.h> | 39 | #include <linux/serial_core.h> |
40 | #include <linux/serial.h> | 40 | #include <linux/serial.h> |
41 | 41 | ||
42 | #include <asm/hardware.h> | 42 | #include <asm/arch/hardware.h> |
43 | #include <asm/io.h> | 43 | #include <asm/io.h> |
44 | #include <asm/irq.h> | 44 | #include <asm/irq.h> |
45 | #include <asm/hardware/clps7111.h> | 45 | #include <asm/hardware/clps7111.h> |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index e0da4dc7bbf6..db3a2df5e5c9 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
46 | #include <asm/irq.h> | 46 | #include <asm/irq.h> |
47 | #include <asm/hardware.h> | 47 | #include <asm/arch/hardware.h> |
48 | #include <asm/arch/imx-uart.h> | 48 | #include <asm/arch/imx-uart.h> |
49 | 49 | ||
50 | /* Register definitions */ | 50 | /* Register definitions */ |
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c index 9f8ccb735c19..edbb85a2cc5b 100644 --- a/drivers/serial/netx-serial.c +++ b/drivers/serial/netx-serial.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include <asm/io.h> | 36 | #include <asm/io.h> |
37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
38 | #include <asm/hardware.h> | 38 | #include <asm/arch/hardware.h> |
39 | #include <asm/arch/netx-regs.h> | 39 | #include <asm/arch/netx-regs.h> |
40 | 40 | ||
41 | /* We've been assigned a range on the "Low-density serial ports" major */ | 41 | /* We've been assigned a range on the "Low-density serial ports" major */ |
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index b9a93f326fb8..033767bed049 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <linux/clk.h> | 45 | #include <linux/clk.h> |
46 | 46 | ||
47 | #include <asm/io.h> | 47 | #include <asm/io.h> |
48 | #include <asm/hardware.h> | 48 | #include <asm/arch/hardware.h> |
49 | #include <asm/irq.h> | 49 | #include <asm/irq.h> |
50 | #include <asm/arch/pxa-regs.h> | 50 | #include <asm/arch/pxa-regs.h> |
51 | 51 | ||
diff --git a/drivers/serial/s3c2400.c b/drivers/serial/s3c2400.c index a1102053e553..525130d67f97 100644 --- a/drivers/serial/s3c2400.c +++ b/drivers/serial/s3c2400.c | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include <asm/irq.h> | 18 | #include <asm/irq.h> |
19 | 19 | ||
20 | #include <asm/hardware.h> | 20 | #include <asm/arch/hardware.h> |
21 | 21 | ||
22 | #include <asm/plat-s3c/regs-serial.h> | 22 | #include <asm/plat-s3c/regs-serial.h> |
23 | #include <asm/arch/regs-gpio.h> | 23 | #include <asm/arch/regs-gpio.h> |
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index c5f03f41686f..f9630c6e6f7e 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/serial.h> | 19 | #include <linux/serial.h> |
20 | 20 | ||
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/hardware.h> | 22 | #include <asm/arch/hardware.h> |
23 | 23 | ||
24 | #include <asm/plat-s3c/regs-serial.h> | 24 | #include <asm/plat-s3c/regs-serial.h> |
25 | #include <asm/arch/regs-gpio.h> | 25 | #include <asm/arch/regs-gpio.h> |
diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c index ce0c220e3e92..b4c0bb5a0415 100644 --- a/drivers/serial/s3c2412.c +++ b/drivers/serial/s3c2412.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/serial.h> | 19 | #include <linux/serial.h> |
20 | 20 | ||
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/hardware.h> | 22 | #include <asm/arch/hardware.h> |
23 | 23 | ||
24 | #include <asm/plat-s3c/regs-serial.h> | 24 | #include <asm/plat-s3c/regs-serial.h> |
25 | #include <asm/arch/regs-gpio.h> | 25 | #include <asm/arch/regs-gpio.h> |
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c index 38f954bd39c6..ea34faa2f653 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/serial/s3c2440.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/serial.h> | 19 | #include <linux/serial.h> |
20 | 20 | ||
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/hardware.h> | 22 | #include <asm/arch/hardware.h> |
23 | 23 | ||
24 | #include <asm/plat-s3c/regs-serial.h> | 24 | #include <asm/plat-s3c/regs-serial.h> |
25 | #include <asm/arch/regs-gpio.h> | 25 | #include <asm/arch/regs-gpio.h> |
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index a5e76cc18073..6c37a58652c2 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c | |||
@@ -39,7 +39,7 @@ | |||
39 | 39 | ||
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
42 | #include <asm/hardware.h> | 42 | #include <asm/arch/hardware.h> |
43 | #include <asm/mach/serial_sa1100.h> | 43 | #include <asm/mach/serial_sa1100.h> |
44 | 44 | ||
45 | /* We've been assigned a range on the "Low-density serial ports" major */ | 45 | /* We've been assigned a range on the "Low-density serial ports" major */ |
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index d852f83f8900..5b964d4bc04d 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c | |||
@@ -45,7 +45,7 @@ | |||
45 | 45 | ||
46 | #include <asm/irq.h> | 46 | #include <asm/irq.h> |
47 | 47 | ||
48 | #include <asm/hardware.h> | 48 | #include <asm/arch/hardware.h> |
49 | 49 | ||
50 | #include <asm/plat-s3c/regs-serial.h> | 50 | #include <asm/plat-s3c/regs-serial.h> |
51 | #include <asm/arch/regs-gpio.h> | 51 | #include <asm/arch/regs-gpio.h> |