odroid-u2-kernel: rollback changes; CONFIG_DRM_EXYNOS_G2D is builtin again.

This commit is contained in:
Gottox 2014-02-13 18:14:39 +01:00
parent 64c122b0cf
commit 52681fddfc
1 changed files with 3 additions and 3 deletions

View File

@ -557,7 +557,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
# CONFIG_SECCOMP is not set
# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_CC_STACKPROTECTOR=y
#
# Boot options
@ -2329,7 +2329,7 @@ CONFIG_VIDEO_EXYNOS_FIMC_LITE=y
# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
# CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
CONFIG_VIDEO_SAMSUNG_S5P_G2D=y
# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
CONFIG_VIDEO_SAMSUNG_S5P_MFC=y
# CONFIG_V4L_TEST_DRIVERS is not set
@ -3097,7 +3097,7 @@ CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_ONESHOT=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_CPU=y
# CONFIG_LEDS_TRIGGER_CPU is not set
CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y