diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/arm/am79c961a.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/ep7211-sir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/sa1100_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/ixp2000/ixp2400-msf.c | 2 | ||||
-rw-r--r-- | drivers/net/netx-eth.c | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c index a637910b02dd..0ece4f9f1fa1 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/hardware.h> | 31 | #include <asm/arch/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/irda/ep7211-sir.c b/drivers/net/irda/ep7211-sir.c index 831572429bb9..2f89d47a37c5 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/hardware.h> | 17 | #include <asm/arch/hardware.h> |
18 | 18 | ||
19 | #include "sir-dev.h" | 19 | #include "sir-dev.h" |
20 | 20 | ||
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index 1bc8518f9197..d16594a5dbc7 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/hardware.h> | 40 | #include <asm/arch/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 9ec38eebfb56..65267c973109 100644 --- a/drivers/net/ixp2000/ixp2400-msf.c +++ b/drivers/net/ixp2000/ixp2400-msf.c | |||
@@ -13,7 +13,7 @@ | |||
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/hardware.h> | 16 | #include <asm/arch/hardware.h> |
17 | #include <asm/arch/ixp2000-regs.h> | 17 | #include <asm/arch/ixp2000-regs.h> |
18 | #include <asm/delay.h> | 18 | #include <asm/delay.h> |
19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
diff --git a/drivers/net/netx-eth.c b/drivers/net/netx-eth.c index dc442e370850..f2655ce526b9 100644 --- a/drivers/net/netx-eth.c +++ b/drivers/net/netx-eth.c | |||
@@ -29,7 +29,6 @@ | |||
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/hardware.h> | ||
33 | #include <asm/arch/hardware.h> | 32 | #include <asm/arch/hardware.h> |
34 | #include <asm/arch/netx-regs.h> | 33 | #include <asm/arch/netx-regs.h> |
35 | #include <asm/arch/pfifo.h> | 34 | #include <asm/arch/pfifo.h> |