diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2016-05-02 11:34:09 +0300 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-05-10 15:10:52 +0300 |
commit | 6cf8440c2b7bf7db3925dfe5419985f19046e5ca (patch) | |
tree | b712aeea975aa722a313b34f1e6f591147c9f0ec /arch/arm/configs/u8500_defconfig | |
parent | 3ef875479c93bcd7e8ec4ffd1c71ea59afc20643 (diff) | |
download | linux-6cf8440c2b7bf7db3925dfe5419985f19046e5ca.tar.xz |
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>
Diffstat (limited to 'arch/arm/configs/u8500_defconfig')
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
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 |