diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-01-30 08:07:14 -0500 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-01-30 08:07:14 -0500 |
| commit | 1d7180e24e22a608cc4d7e8fd425a19a9394a7ed (patch) | |
| tree | bd747993fe7943d0f28578e371f426e4f6227ad3 /arch/arm/mach-imx/devices/platform-fec.c | |
| parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) | |
| parent | 7356420cd34e40fe27bf26555b0bf3f2849a43dd (diff) | |
Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle
Diffstat (limited to 'arch/arm/mach-imx/devices/platform-fec.c')
| -rw-r--r-- | arch/arm/mach-imx/devices/platform-fec.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/devices/platform-fec.c b/arch/arm/mach-imx/devices/platform-fec.c index 2cb188ad9a0a..63eba08f87b1 100644 --- a/arch/arm/mach-imx/devices/platform-fec.c +++ b/arch/arm/mach-imx/devices/platform-fec.c | |||
| @@ -35,12 +35,6 @@ const struct imx_fec_data imx35_fec_data __initconst = | |||
| 35 | imx_fec_data_entry_single(MX35, "imx27-fec"); | 35 | imx_fec_data_entry_single(MX35, "imx27-fec"); |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | #ifdef CONFIG_SOC_IMX50 | ||
| 39 | /* i.mx50 has the i.mx25 type fec */ | ||
| 40 | const struct imx_fec_data imx50_fec_data __initconst = | ||
| 41 | imx_fec_data_entry_single(MX50, "imx25-fec"); | ||
| 42 | #endif | ||
| 43 | |||
| 44 | #ifdef CONFIG_SOC_IMX51 | 38 | #ifdef CONFIG_SOC_IMX51 |
| 45 | /* i.mx51 has the i.mx27 type fec */ | 39 | /* i.mx51 has the i.mx27 type fec */ |
| 46 | const struct imx_fec_data imx51_fec_data __initconst = | 40 | const struct imx_fec_data imx51_fec_data __initconst = |