diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:33:32 -0500 |
| commit | 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 (patch) | |
| tree | 99119edc53fdca73ed7586829b8ee736e09440b3 /arch/arm/plat-mxc/devices/platform-fec.c | |
| parent | 28cdac6690cb113856293bf79b40de33dbd8f974 (diff) | |
| parent | 1051b9f0f9eab8091fe3bf98320741adf36b4cfa (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/mach-pxa/clock.c
arch/arm/mach-pxa/clock.h
Diffstat (limited to 'arch/arm/plat-mxc/devices/platform-fec.c')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-fec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-fec.c b/arch/arm/plat-mxc/devices/platform-fec.c index 11d087f4e219..269ec78aba77 100644 --- a/arch/arm/plat-mxc/devices/platform-fec.c +++ b/arch/arm/plat-mxc/devices/platform-fec.c | |||
| @@ -16,22 +16,22 @@ | |||
| 16 | .irq = soc ## _INT_FEC, \ | 16 | .irq = soc ## _INT_FEC, \ |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | #ifdef CONFIG_ARCH_MX25 | 19 | #ifdef CONFIG_SOC_IMX25 |
| 20 | const struct imx_fec_data imx25_fec_data __initconst = | 20 | const struct imx_fec_data imx25_fec_data __initconst = |
| 21 | imx_fec_data_entry_single(MX25); | 21 | imx_fec_data_entry_single(MX25); |
| 22 | #endif /* ifdef CONFIG_ARCH_MX25 */ | 22 | #endif /* ifdef CONFIG_SOC_IMX25 */ |
| 23 | 23 | ||
| 24 | #ifdef CONFIG_SOC_IMX27 | 24 | #ifdef CONFIG_SOC_IMX27 |
| 25 | const struct imx_fec_data imx27_fec_data __initconst = | 25 | const struct imx_fec_data imx27_fec_data __initconst = |
| 26 | imx_fec_data_entry_single(MX27); | 26 | imx_fec_data_entry_single(MX27); |
| 27 | #endif /* ifdef CONFIG_SOC_IMX27 */ | 27 | #endif /* ifdef CONFIG_SOC_IMX27 */ |
| 28 | 28 | ||
| 29 | #ifdef CONFIG_ARCH_MX35 | 29 | #ifdef CONFIG_SOC_IMX35 |
| 30 | const struct imx_fec_data imx35_fec_data __initconst = | 30 | const struct imx_fec_data imx35_fec_data __initconst = |
| 31 | imx_fec_data_entry_single(MX35); | 31 | imx_fec_data_entry_single(MX35); |
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||
| 34 | #ifdef CONFIG_ARCH_MX51 | 34 | #ifdef CONFIG_SOC_IMX51 |
| 35 | const struct imx_fec_data imx51_fec_data __initconst = | 35 | const struct imx_fec_data imx51_fec_data __initconst = |
| 36 | imx_fec_data_entry_single(MX51); | 36 | imx_fec_data_entry_single(MX51); |
| 37 | #endif | 37 | #endif |