From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 2 May 2016 08:34:09 +0000 (+0200)
Subject: ARM: u8500_defconfig: remove staging from defconfig
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6cf8440c2b7bf7db3925dfe5419985f19046e5ca;p=deliverable%2Flinux.git

ARM: u8500_defconfig: remove staging from defconfig

Ux500 was enabling the staging drivers due to the RMI4
touchscreen driver, this is now properly upstream, so drop
this and the dead symbol for the old RMI4 hack from
the defconfig.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 07055eacbb0f..f70f46498fa0 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -104,8 +104,6 @@ CONFIG_RTC_DRV_AB8500=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_DMADEVICES=y
 CONFIG_STE_DMA40=y
-CONFIG_STAGING=y
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y
 CONFIG_HSEM_U8500=y
 CONFIG_IIO=y
 CONFIG_IIO_ST_ACCEL_3AXIS=y