diff options
| author | Robby Cai <R63905@freescale.com> | 2010-03-15 16:57:17 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:17:21 +0200 |
| commit | 7cf02905030eef94836b47f080a0c2b9229f3cf0 (patch) | |
| tree | 664fc7d7a511576b209eb766733103a4550fb5b4 /arch | |
| parent | 262ad3d751730da9801fdf450c108d57bbe107fd (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')
| -rw-r--r-- | arch/arm/mach-mx23/device.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx28/device.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxs/device.c | 8 |
3 files changed, 8 insertions, 8 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, diff --git a/arch/arm/mach-mx28/device.c b/arch/arm/mach-mx28/device.c index d63055ae916c..0b5e440ebc97 100644 --- a/arch/arm/mach-mx28/device.c +++ b/arch/arm/mach-mx28/device.c @@ -163,8 +163,8 @@ static void __init mx28_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, diff --git a/arch/arm/plat-mxs/device.c b/arch/arm/plat-mxs/device.c index 4b7b5d5253a0..58f483b5f1a2 100644 --- a/arch/arm/plat-mxs/device.c +++ b/arch/arm/plat-mxs/device.c @@ -221,8 +221,8 @@ struct platform_device mxs_bl = { }; #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 platform_device mxs_pxp = { .name = "mxs-pxp", .id = 0, @@ -487,8 +487,8 @@ static struct mxs_dev_lookup dev_lookup[] = { }, #endif -#if defined(CONFIG_VIDEO_PXP) || \ - defined(CONFIG_VIDEO_PXP_MODULE) +#if defined(CONFIG_VIDEO_MXS_PXP) || \ + defined(CONFIG_VIDEO_MXS_PXP_MODULE) { .name = "mxs-pxp", .size = 1, |