diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 11:14:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:48 -0400 |
commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
tree | 69689f467179891b498bd7423fcf61925173db31 /drivers/net | |
parent | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff) |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/arm/am79c961a.c | 2 | ||||
-rw-r--r-- | drivers/net/arm/at91_ether.c | 6 | ||||
-rw-r--r-- | drivers/net/arm/ep93xx_eth.c | 4 | ||||
-rw-r--r-- | drivers/net/arm/ixp4xx_eth.c | 4 | ||||
-rw-r--r-- | drivers/net/cs89x0.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/ep7211-sir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/sa1100_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/ixp2000/ixp2400-msf.c | 4 | ||||
-rw-r--r-- | drivers/net/macb.c | 4 | ||||
-rw-r--r-- | drivers/net/netx-eth.c | 10 | ||||
-rw-r--r-- | drivers/net/smc911x.h | 2 | ||||
-rw-r--r-- | drivers/net/smc91x.h | 6 |
13 files changed, 26 insertions, 26 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index 0ece4f9f1fa1..aa4a5246be53 100644 --- a/drivers/net/arm/am79c961a.c +++ b/drivers/net/arm/am79c961a.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/bitops.h> | 28 | #include <linux/bitops.h> |
29 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
30 | 30 | ||
31 | #include <asm/arch/hardware.h> | 31 | #include <mach/hardware.h> |
32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
33 | #include <asm/system.h> | 33 | #include <asm/system.h> |
34 | 34 | ||
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index ffae266e2d7f..0fa53464efb2 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c | |||
@@ -32,9 +32,9 @@ | |||
32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
34 | 34 | ||
35 | #include <asm/arch/at91rm9200_emac.h> | 35 | #include <mach/at91rm9200_emac.h> |
36 | #include <asm/arch/gpio.h> | 36 | #include <mach/gpio.h> |
37 | #include <asm/arch/board.h> | 37 | #include <mach/board.h> |
38 | 38 | ||
39 | #include "at91_ether.h" | 39 | #include "at91_ether.h" |
40 | 40 | ||
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index 18d3eeb7eab2..1267444d79da 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
@@ -20,8 +20,8 @@ | |||
20 | #include <linux/moduleparam.h> | 20 | #include <linux/moduleparam.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | #include <asm/arch/ep93xx-regs.h> | 23 | #include <mach/ep93xx-regs.h> |
24 | #include <asm/arch/platform.h> | 24 | #include <mach/platform.h> |
25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
26 | 26 | ||
27 | #define DRV_MODULE_NAME "ep93xx-eth" | 27 | #define DRV_MODULE_NAME "ep93xx-eth" |
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 9b777d9433cd..020771bfb603 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
@@ -32,8 +32,8 @@ | |||
32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
33 | #include <linux/mii.h> | 33 | #include <linux/mii.h> |
34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
35 | #include <asm/arch/npe.h> | 35 | #include <mach/npe.h> |
36 | #include <asm/arch/qmgr.h> | 36 | #include <mach/qmgr.h> |
37 | 37 | ||
38 | #define DEBUG_QUEUES 0 | 38 | #define DEBUG_QUEUES 0 |
39 | #define DEBUG_DESC 0 | 39 | #define DEBUG_DESC 0 |
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index fba87abe78ee..ea6144a9565e 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -189,7 +189,7 @@ static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT | |||
189 | static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; | 189 | static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; |
190 | #elif defined(CONFIG_ARCH_PNX010X) | 190 | #elif defined(CONFIG_ARCH_PNX010X) |
191 | #include <asm/irq.h> | 191 | #include <asm/irq.h> |
192 | #include <asm/arch/gpio.h> | 192 | #include <mach/gpio.h> |
193 | #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */ | 193 | #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */ |
194 | #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */ | 194 | #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */ |
195 | static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0}; | 195 | static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0}; |
diff --git a/drivers/net/irda/ep7211-sir.c b/drivers/net/irda/ep7211-sir.c index 2f89d47a37c5..f83c5b881d2d 100644 --- a/drivers/net/irda/ep7211-sir.c +++ b/drivers/net/irda/ep7211-sir.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <net/irda/irda_device.h> | 14 | #include <net/irda/irda_device.h> |
15 | 15 | ||
16 | #include <asm/io.h> | 16 | #include <asm/io.h> |
17 | #include <asm/arch/hardware.h> | 17 | #include <mach/hardware.h> |
18 | 18 | ||
19 | #include "sir-dev.h" | 19 | #include "sir-dev.h" |
20 | 20 | ||
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index f76b0b6c277d..4aa61a1a3d55 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <net/irda/irda_device.h> | 23 | #include <net/irda/irda_device.h> |
24 | 24 | ||
25 | #include <asm/dma.h> | 25 | #include <asm/dma.h> |
26 | #include <asm/arch/irda.h> | 26 | #include <mach/irda.h> |
27 | #include <asm/arch/pxa-regs.h> | 27 | #include <mach/pxa-regs.h> |
28 | 28 | ||
29 | #define IrSR_RXPL_NEG_IS_ZERO (1<<4) | 29 | #define IrSR_RXPL_NEG_IS_ZERO (1<<4) |
30 | #define IrSR_RXPL_POS_IS_ZERO 0x0 | 30 | #define IrSR_RXPL_POS_IS_ZERO 0x0 |
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index d16594a5dbc7..a95188948de7 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
39 | #include <asm/dma.h> | 39 | #include <asm/dma.h> |
40 | #include <asm/arch/hardware.h> | 40 | #include <mach/hardware.h> |
41 | #include <asm/mach/irda.h> | 41 | #include <asm/mach/irda.h> |
42 | 42 | ||
43 | static int power_level = 3; | 43 | static int power_level = 3; |
diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ixp2000/ixp2400-msf.c index 65267c973109..f5ffd7e05d26 100644 --- a/drivers/net/ixp2000/ixp2400-msf.c +++ b/drivers/net/ixp2000/ixp2400-msf.c | |||
@@ -13,8 +13,8 @@ | |||
13 | 13 | ||
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <asm/arch/hardware.h> | 16 | #include <mach/hardware.h> |
17 | #include <asm/arch/ixp2000-regs.h> | 17 | #include <mach/ixp2000-regs.h> |
18 | #include <asm/delay.h> | 18 | #include <asm/delay.h> |
19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
20 | #include "ixp2400-msf.h" | 20 | #include "ixp2400-msf.h" |
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index daba82bbcb56..84c77f1f9a5c 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c | |||
@@ -21,8 +21,8 @@ | |||
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/phy.h> | 22 | #include <linux/phy.h> |
23 | 23 | ||
24 | #include <asm/arch/board.h> | 24 | #include <mach/board.h> |
25 | #include <asm/arch/cpu.h> | 25 | #include <mach/cpu.h> |
26 | 26 | ||
27 | #include "macb.h" | 27 | #include "macb.h" |
28 | 28 | ||
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index f2655ce526b9..3f9af759cb90 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c | |||
@@ -29,11 +29,11 @@ | |||
29 | #include <linux/mii.h> | 29 | #include <linux/mii.h> |
30 | 30 | ||
31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
32 | #include <asm/arch/hardware.h> | 32 | #include <mach/hardware.h> |
33 | #include <asm/arch/netx-regs.h> | 33 | #include <mach/netx-regs.h> |
34 | #include <asm/arch/pfifo.h> | 34 | #include <mach/pfifo.h> |
35 | #include <asm/arch/xc.h> | 35 | #include <mach/xc.h> |
36 | #include <asm/arch/eth.h> | 36 | #include <mach/eth.h> |
37 | 37 | ||
38 | /* XC Fifo Offsets */ | 38 | /* XC Fifo Offsets */ |
39 | #define EMPTY_PTR_FIFO(xcno) (0 + ((xcno) << 3)) /* Index of the empty pointer FIFO */ | 39 | #define EMPTY_PTR_FIFO(xcno) (0 + ((xcno) << 3)) /* Index of the empty pointer FIFO */ |
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h index 76c17c28fab4..2abfc2845198 100644 --- a/drivers/net/smc911x.h +++ b/drivers/net/smc911x.h | |||
@@ -222,7 +222,7 @@ static inline void SMC_outsl(struct smc911x_local *lp, int reg, | |||
222 | */ | 222 | */ |
223 | #include <linux/dma-mapping.h> | 223 | #include <linux/dma-mapping.h> |
224 | #include <asm/dma.h> | 224 | #include <asm/dma.h> |
225 | #include <asm/arch/pxa-regs.h> | 225 | #include <mach/pxa-regs.h> |
226 | 226 | ||
227 | static dma_addr_t rx_dmabuf, tx_dmabuf; | 227 | static dma_addr_t rx_dmabuf, tx_dmabuf; |
228 | static int rx_dmalen, tx_dmalen; | 228 | static int rx_dmalen, tx_dmalen; |
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 22209b6f1405..997e7f1d5c6e 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -187,7 +187,7 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
187 | 187 | ||
188 | #elif defined(CONFIG_SA1100_ASSABET) | 188 | #elif defined(CONFIG_SA1100_ASSABET) |
189 | 189 | ||
190 | #include <asm/arch/neponset.h> | 190 | #include <mach/neponset.h> |
191 | 191 | ||
192 | /* We can only do 8-bit reads and writes in the static memory space. */ | 192 | /* We can only do 8-bit reads and writes in the static memory space. */ |
193 | #define SMC_CAN_USE_8BIT 1 | 193 | #define SMC_CAN_USE_8BIT 1 |
@@ -339,7 +339,7 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
339 | * IOBARRIER on entry to their ISR. | 339 | * IOBARRIER on entry to their ISR. |
340 | */ | 340 | */ |
341 | 341 | ||
342 | #include <asm/arch/constants.h> /* IOBARRIER_VIRT */ | 342 | #include <mach/constants.h> /* IOBARRIER_VIRT */ |
343 | 343 | ||
344 | #define SMC_CAN_USE_8BIT 0 | 344 | #define SMC_CAN_USE_8BIT 0 |
345 | #define SMC_CAN_USE_16BIT 1 | 345 | #define SMC_CAN_USE_16BIT 1 |
@@ -525,7 +525,7 @@ struct smc_local { | |||
525 | */ | 525 | */ |
526 | #include <linux/dma-mapping.h> | 526 | #include <linux/dma-mapping.h> |
527 | #include <asm/dma.h> | 527 | #include <asm/dma.h> |
528 | #include <asm/arch/pxa-regs.h> | 528 | #include <mach/pxa-regs.h> |
529 | 529 | ||
530 | #ifdef SMC_insl | 530 | #ifdef SMC_insl |
531 | #undef SMC_insl | 531 | #undef SMC_insl |