From 329fbac16f7bed4f85a2625b0c4a5a0a92af39d2 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 23 Aug 2011 21:19:53 +0200 Subject: [PATCH] --- yaml --- r: 272511 b: refs/heads/master c: 25c038ee0d3a6599f0165f97a651d988d7afd40b h: refs/heads/master i: 272509: 63d7ce99b3372cc5962f76db2c8be810d4f3e468 272507: 76841952bc6fb22ac472fb190ac5ff6d5d43cedd 272503: d50e911da06db0911533982a6d08fcf701010997 272495: 0d547d9b13c713c1443fd2c025def23342b44248 272479: cb25603361e33138b0dc0e498745426a7d61abd7 272447: dba8da0338fcec90f2a75e50bab6166f66438636 272383: b59ddc0bf7a22a5ecab80c0086a3902da70a1d43 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/Makefile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c3894bbe1b47..5c15e0aad2f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56c6b8721f433cc1adfdcd191bbfbe0e747a1147 +refs/heads/master: 25c038ee0d3a6599f0165f97a651d988d7afd40b diff --git a/trunk/arch/arm/mach-imx/Makefile b/trunk/arch/arm/mach-imx/Makefile index e9eb36dad888..db6394a77e85 100644 --- a/trunk/arch/arm/mach-imx/Makefile +++ b/trunk/arch/arm/mach-imx/Makefile @@ -1,12 +1,12 @@ obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o -obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o -obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o +obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o +obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o -obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o +obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o -obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o -obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o +obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o +obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o obj-$(CONFIG_SOC_IMX31) += mm-imx31.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o obj-$(CONFIG_SOC_IMX35) += mm-imx35.o cpu-imx35.o clock-imx35.o ehci-imx35.o