summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx23/device.c
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2010-03-15 16:57:17 +0800
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-25 11:17:21 +0200
commit7cf02905030eef94836b47f080a0c2b9229f3cf0 (patch)
tree664fc7d7a511576b209eb766733103a4550fb5b4 /arch/arm/mach-mx23/device.c
parent262ad3d751730da9801fdf450c108d57bbe107fd (diff)
ENGR00121574-1 rename filename for pxp to mxs_pxp
rename filename to avoid polluting original stmp codes this patch contains MSL-related code changes Signed-off-by: Robby Cai <R63905@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/mach-mx23/device.c')
-rw-r--r--arch/arm/mach-mx23/device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx23/device.c b/arch/arm/mach-mx23/device.c
index fc2ddc1a01ef..4fde597d1b7b 100644
--- a/arch/arm/mach-mx23/device.c
+++ b/arch/arm/mach-mx23/device.c
@@ -164,8 +164,8 @@ static void __init mx23_init_lcdif(void)
}
#endif
-#if defined(CONFIG_VIDEO_PXP) || \
- defined(CONFIG_VIDEO_PXP_MODULE)
+#if defined(CONFIG_VIDEO_MXS_PXP) || \
+ defined(CONFIG_VIDEO_MXS_PXP_MODULE)
static struct resource pxp_resource[] = {
{
.flags = IORESOURCE_MEM,