Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-mx3 / Makefile

diff --git a/arch/arm/mach-mx3/Makefile b/arch/arm/mach-mx3/Makefile
index 8a182d0a3fcf9d11aa6307c9410c94ee27541924..8db13294ad27270362e0c43cd3dc71a18005dc67 100644 (file)
--- a/arch/arm/mach-mx3/Makefile
+++ b/arch/arm/mach-mx3/Makefile
@@ -5,17 +5,14 @@
 # Object file lists.
 
 obj-y                          := mm.o devices.o cpu.o
-CFLAGS_mm.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
-CFLAGS_devices.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
-obj-$(CONFIG_ARCH_MX31)                += clock-imx31.o iomux-imx31.o
-obj-$(CONFIG_ARCH_MX35)                += clock-imx35.o
+obj-$(CONFIG_SOC_IMX31)                += clock-imx31.o iomux-imx31.o
+obj-$(CONFIG_SOC_IMX35)                += clock-imx35.o
 obj-$(CONFIG_MACH_MX31ADS)     += mach-mx31ads.o
 obj-$(CONFIG_MACH_MX31LILLY)   += mach-mx31lilly.o mx31lilly-db.o
 obj-$(CONFIG_MACH_MX31LITE)    += mach-mx31lite.o mx31lite-db.o
 obj-$(CONFIG_MACH_PCM037)      += mach-pcm037.o
 obj-$(CONFIG_MACH_PCM037_EET)  += mach-pcm037_eet.o
 obj-$(CONFIG_MACH_MX31_3DS)    += mach-mx31_3ds.o
-CFLAGS_mach-mx31_3ds.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS
 obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \
                                   mx31moboard-marxbot.o mx31moboard-smartbot.o
 obj-$(CONFIG_MACH_QONG)                += mach-qong.o