config: enable specific capabilities again

Enable CONFIG_MARU and CONFIG_YAGL capability. It was disabled during merge.

Change-Id: I4a3b108697fb1c03254b07de9ff786a47a464e09
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index b3138fb..bcb559a 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -170,4 +170,7 @@ source "drivers/phy/Kconfig"
 
 source "drivers/powercap/Kconfig"
 
+# for maru board
+source "drivers/maru/Kconfig"
+
 endmenu

diff --git a/drivers/Makefile b/drivers/Makefile
index 8e3b8b0..aa191ae 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -155,3 +155,6 @@ obj-$(CONFIG_IPACK_BUS)             += ipack/
 obj-$(CONFIG_NTB)              += ntb/
 obj-$(CONFIG_FMC)              += fmc/
 obj-$(CONFIG_POWERCAP)         += powercap/
+
+# For maru board
+obj-$(CONFIG_MARU)             += maru/

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 246b57d..050938c 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -51,7 +51,7 @@ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
 obj-$(CONFIG_DRM_EXYNOS) +=exynos/
 obj-$(CONFIG_DRM_GMA500) += gma500/
 obj-$(CONFIG_DRM_UDL) += udl/
-obj-$(CONFIG_DRM_VIGS) += vigs/
+obj-$(CONFIG_DRM_VIGS) += vigs/
 obj-$(CONFIG_DRM_AST) += ast/
 obj-$(CONFIG_DRM_ARMADA) += armada/
 obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index dade5b7..afb5219 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -23,6 +23,8 @@ source "drivers/gpu/host1x/Kconfig"
 
 source "drivers/gpu/drm/Kconfig"
 
+source "drivers/gpu/yagl/Kconfig"
+
 config VGASTATE
        tristate
        default n