Skip to content

Commit

Permalink
sunxi:cedar Merge sun5i_cedar into sunxi_cedar
Browse files Browse the repository at this point in the history
Change CONFIG_VIDEO_SUN5I_CEDAR to CONFIG_VIDEO_SUNXI_CEDAR in A13
defconfig files.

Signed-off-by: Patrick Wood <[email protected]>
  • Loading branch information
patrickhwood committed Oct 24, 2013
1 parent 0d07046 commit 4248eea
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/arm/configs/a12_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ CONFIG_AW_AXP=y
# CONFIG_HWMON is not set
CONFIG_REGULATOR=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_SUN5I_CEDAR=y
CONFIG_VIDEO_SUNXI_CEDAR=y
CONFIG_PA_CONTROL=y
CONFIG_MALI=m
# CONFIG_UMP_DEBUG is not set
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/a12_nuclear_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ CONFIG_MEDIA_TUNER_CUSTOMISE=y
# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
# CONFIG_VIDEO_IR_I2C is not set
# CONFIG_V4L_USB_DRIVERS is not set
CONFIG_VIDEO_SUN5I_CEDAR=y
CONFIG_VIDEO_SUNXI_CEDAR=y
CONFIG_CSI_OV7670=m
CONFIG_CSI_GT2005=m
CONFIG_CSI_GC0308=m
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/a13_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ CONFIG_AW_AXP=y
# CONFIG_HWMON is not set
CONFIG_REGULATOR=y
CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_SUN5I_CEDAR=y
CONFIG_VIDEO_SUNXI_CEDAR=y
CONFIG_PA_CONTROL=y
CONFIG_MALI=m
# CONFIG_UMP_DEBUG is not set
Expand Down

0 comments on commit 4248eea

Please sign in to comment.