diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-24 09:15:15 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-14 05:17:36 -0400 |
commit | 2960ed3468773b1a0b2533dd7a562673cc799437 (patch) | |
tree | 0cce23b6cf9b6eb40bde0588c61e49df954451a6 | |
parent | 1ef21f6343ff08309955d1ad56ad0f5504a4dd94 (diff) |
ARM: netx: move platform_data definitions
Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.
This moves such data out of the netx include directories
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
-rw-r--r-- | arch/arm/mach-netx/nxdb500.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxdkn.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-netx/nxeb500hmi.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/netx-eth.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/eth-netx.h (renamed from arch/arm/mach-netx/include/mach/eth.h) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c index 180ea899a48a..8b781ff7c9e9 100644 --- a/arch/arm/mach-netx/nxdb500.c +++ b/arch/arm/mach-netx/nxdb500.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | #include <asm/hardware/vic.h> | 31 | #include <asm/hardware/vic.h> |
32 | #include <mach/netx-regs.h> | 32 | #include <mach/netx-regs.h> |
33 | #include <mach/eth.h> | 33 | #include <linux/platform_data/eth-netx.h> |
34 | 34 | ||
35 | #include "generic.h" | 35 | #include "generic.h" |
36 | #include "fb.h" | 36 | #include "fb.h" |
diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c index 58009e29b20e..b26dbce334f2 100644 --- a/arch/arm/mach-netx/nxdkn.c +++ b/arch/arm/mach-netx/nxdkn.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | #include <asm/hardware/vic.h> | 31 | #include <asm/hardware/vic.h> |
32 | #include <mach/netx-regs.h> | 32 | #include <mach/netx-regs.h> |
33 | #include <mach/eth.h> | 33 | #include <linux/platform_data/eth-netx.h> |
34 | 34 | ||
35 | #include "generic.h" | 35 | #include "generic.h" |
36 | 36 | ||
diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c index 122e99826ef6..257382efafa0 100644 --- a/arch/arm/mach-netx/nxeb500hmi.c +++ b/arch/arm/mach-netx/nxeb500hmi.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
31 | #include <asm/hardware/vic.h> | 31 | #include <asm/hardware/vic.h> |
32 | #include <mach/netx-regs.h> | 32 | #include <mach/netx-regs.h> |
33 | #include <mach/eth.h> | 33 | #include <linux/platform_data/eth-netx.h> |
34 | 34 | ||
35 | #include "generic.h" | 35 | #include "generic.h" |
36 | #include "fb.h" | 36 | #include "fb.h" |
diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c index 9d11ab7521bc..63e7af44366f 100644 --- a/drivers/net/ethernet/netx-eth.c +++ b/drivers/net/ethernet/netx-eth.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <mach/netx-regs.h> | 34 | #include <mach/netx-regs.h> |
35 | #include <mach/pfifo.h> | 35 | #include <mach/pfifo.h> |
36 | #include <mach/xc.h> | 36 | #include <mach/xc.h> |
37 | #include <mach/eth.h> | 37 | #include <linux/platform_data/eth-netx.h> |
38 | 38 | ||
39 | /* XC Fifo Offsets */ | 39 | /* XC Fifo Offsets */ |
40 | #define EMPTY_PTR_FIFO(xcno) (0 + ((xcno) << 3)) /* Index of the empty pointer FIFO */ | 40 | #define EMPTY_PTR_FIFO(xcno) (0 + ((xcno) << 3)) /* Index of the empty pointer FIFO */ |
diff --git a/arch/arm/mach-netx/include/mach/eth.h b/include/linux/platform_data/eth-netx.h index 88af1ac28ead..88af1ac28ead 100644 --- a/arch/arm/mach-netx/include/mach/eth.h +++ b/include/linux/platform_data/eth-netx.h | |||