summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxs
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2010-03-15 16:57:17 +0800
committerFrank Li <Frank.Li@freescale.com>2010-03-16 12:37:54 +0800
commit02b51a0bb08dc8fb79507e91cfe16c742fac1765 (patch)
tree4faa0061393ce03884eb986e5aa7daa4c156468c /arch/arm/plat-mxs
parentb35a3a001fad7d967fae6ad7ebc9cc7405baa4b4 (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>
Diffstat (limited to 'arch/arm/plat-mxs')
-rw-r--r--arch/arm/plat-mxs/device.c8
1 files changed, 4 insertions, 4 deletions
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,