diff options
| author | Robby Cai <R63905@freescale.com> | 2010-03-15 17:02:45 +0800 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:17:21 +0200 |
| commit | 9b2873de67dbcbd5dded28cb1054a00902388d63 (patch) | |
| tree | f5738817d6b6b0445692b55d9ed71a0c7f087135 /arch/arm | |
| parent | 290b87895382070d5bd833fc3c9ddd1406fdc4cb (diff) | |
ENGR00121574-3 rename filename for pxp to mxs_pxp
update default config
Signed-off-by: Robby Cai <R63905@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx23evk_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm/configs/imx28evk_defconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/imx23evk_defconfig b/arch/arm/configs/imx23evk_defconfig index 5c646a45d8ca..4511569943d3 100644 --- a/arch/arm/configs/imx23evk_defconfig +++ b/arch/arm/configs/imx23evk_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.31 -# Mon Mar 15 09:38:37 2010 +# Mon Mar 15 16:08:57 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -693,7 +693,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # CONFIG_VIDEO_VIVI is not set -CONFIG_VIDEO_PXP=y +CONFIG_VIDEO_MXS_PXP=y # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set diff --git a/arch/arm/configs/imx28evk_defconfig b/arch/arm/configs/imx28evk_defconfig index 37733e7a4295..8c2becc408da 100644 --- a/arch/arm/configs/imx28evk_defconfig +++ b/arch/arm/configs/imx28evk_defconfig @@ -961,7 +961,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_VIVI is not set -CONFIG_VIDEO_PXP=y +CONFIG_VIDEO_MXS_PXP=y # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_SOC_CAMERA is not set |