diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-02-05 02:14:40 (GMT) |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-02-05 02:14:40 (GMT) |
| commit | f662f52a91742f2aec738492eab87b937216d89f (patch) | |
| tree | 4950bc0dd10daf71849a5a3efbe0fb99b6184759 /arch/arm/configs | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | 7356420cd34e40fe27bf26555b0bf3f2849a43dd (diff) | |
| download | linux-fsl-qoriq-f662f52a91742f2aec738492eab87b937216d89f.tar.xz | |
Merge tag 'imx-cleanup-3.9' into imx/soc
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 6966713..6dddbf8 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -32,7 +32,6 @@ CONFIG_MACH_PCM043=y CONFIG_MACH_MX35_3DS=y CONFIG_MACH_VPR200=y CONFIG_MACH_IMX51_DT=y -CONFIG_MACH_MX51_3DS=y CONFIG_MACH_EUKREA_CPUIMX51SD=y CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y |