CHROMIUM: config: re-sync kernel config after dma-buf kds separation

[cascardo/linux.git] / chromeos / config / armel / chromeos-exynos5.flavour.config

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index c5e1d6e..98884fb 100644 (file)
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -38,6 +38,7 @@ CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BUSFREQ_OPP=y
 # CONFIG_CACHE_L2X0 is not set
+CONFIG_CHARGER_CHROMEOS_EC=y
 CONFIG_CHARGER_TPS65090=y
 CONFIG_CHROMEOS_RAMOOPS_RAM_START=0x41f00000
 CONFIG_CMDLINE="root=/dev/nfs rw nfsroot=192.168.0.10:/media/opt/cramfs console=ttySAC2,115200 ip=192.168.0.20:192.168.0.10:192.168.0.1:255.255.255.0:test::off init=/linuxrc"
@@ -60,7 +61,6 @@ CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE=y
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_SHARED_BUFFER_USES_KDS=y
 CONFIG_DRM=y
 CONFIG_DRM_EXYNOS=y
@@ -74,6 +74,7 @@ CONFIG_DRM_EXYNOS_HDMI=y
 # CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_PS8622=y
 CONFIG_DRM_PTN3460=y
 # CONFIG_DRM_UDL is not set
 # CONFIG_DW_DMAC is not set
@@ -97,8 +98,6 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_EXYNOS_FIMD_V8=y
 CONFIG_FB_MIPI_DSIM=y
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_GENERIC_IRQ_CHIP=y
 # CONFIG_GPIO_PL061 is not set
@@ -114,7 +113,6 @@ CONFIG_I2C_CHROMEOS_EC=y
 CONFIG_I2C_S3C2410=y
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_IOMMU_API=y
-CONFIG_KDS=y
 CONFIG_KEYBOARD_MKBP=y
 # CONFIG_KS8842 is not set
 # CONFIG_LCD_AMS369FG06 is not set
@@ -143,6 +141,10 @@ CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="exynos5"
 # CONFIG_MALI_QA_RESFAIL is not set
 # CONFIG_MALI_SYSTEM_TRACE is not set
 CONFIG_MALI_T6XX=y
+# CONFIG_MALI_T6XX_DEBUG_SYS is not set
+# CONFIG_MALI_T6XX_DEMAND_POLICY is not set
+# CONFIG_MALI_T6XX_ENABLE_TRACE is not set
+# CONFIG_MALI_T6XX_RT_PM is not set
 CONFIG_MALI_UNCACHED=y
 # CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_MEDIA_CONTROLLER=y
@@ -179,7 +181,6 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEON=y
 # CONFIG_NET_DMA is not set
 CONFIG_NO_IOPORT=y
-CONFIG_OABI_COMPAT=y
 # CONFIG_OC_ETM is not set
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_PL330_DMA=y
@@ -188,7 +189,6 @@ CONFIG_PLAT_SAMSUNG=y
 CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
 CONFIG_PM_OPP=y
-CONFIG_PS8622=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_REGULATOR_CHROMEOS_EC_TPS65090=y
 CONFIG_REGULATOR_MAX77686=y
@@ -210,6 +210,7 @@ CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=3
 CONFIG_S5P_GPIO_DRVSTR=y
+CONFIG_S5P_GPIO_INT=y
 CONFIG_S5P_PM=y
 CONFIG_S5P_SLEEP=y
 CONFIG_SAMSUNG_CLKSRC=y
@@ -242,8 +243,8 @@ CONFIG_SMSC911X=y
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SND_SAMSUNG_I2S=y
 CONFIG_SND_SOC_EXYNOS_MAX98095=y
-CONFIG_SND_SOC_MAX98095=y
 CONFIG_SND_SOC_MAX98088=y
+CONFIG_SND_SOC_MAX98095=y
 CONFIG_SND_SOC_SAMSUNG=y
 CONFIG_SND_SOC_SAMSUNG_HDMI_AUDIO=y
 # CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF is not set