arm/imx: merge mm-imx35.c into mm-imx31.c
authorShawn Guo <shawn.guo@linaro.org>
Wed, 28 Sep 2011 09:16:03 +0000 (17:16 +0800)
committerSascha Hauer <s.hauer@pengutronix.de>
Wed, 28 Sep 2011 11:39:41 +0000 (13:39 +0200)
commitf1263de200a25e89a2529202889e75bfd50320ba
tree455154ba61fbe611615f2633d25980489fe4c9ad
parentfcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c
arm/imx: merge mm-imx35.c into mm-imx31.c

As imx31 and imx35 have much in common at soc level, this patch merges
mm-imx35.c into mm-imx31.c, so that the common functions between imx31
and imx35 can be added in one file later.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c [deleted file]