diff options
author | Baptiste Jonglez | 2016-03-22 13:38:26 +0100 |
---|---|---|
committer | Baptiste Jonglez | 2016-03-22 14:08:26 +0100 |
commit | b6bb0b1060769002fd40368f56e1c4d7b8333b5d (patch) | |
tree | d911533dc1378529a9e93ad5f8841de204cac834 /config | |
parent | c1992d2014ca452db86be51767dea915223f8080 (diff) | |
download | aur-b6bb0b1060769002fd40368f56e1c4d7b8333b5d.tar.gz |
linux-mptcp: Add several config upstream changes
r255727 (fixing #46488), r255728 (fixing #47066), r255731 (fixing #46316).
Diffstat (limited to 'config')
-rw-r--r-- | config | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1710,7 +1710,8 @@ CONFIG_MTD_SCB2_FLASH=m # CONFIG_MTD_NETtel is not set # CONFIG_MTD_L440GX is not set CONFIG_MTD_PCI=m -# CONFIG_MTD_PCMCIA is not set +CONFIG_MTD_PCMCIA=m +# CONFIG_MTD_PCMCIA_ANONYMOUS is not set # CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m @@ -1770,7 +1771,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_BLOCK=y CONFIG_OF=y # @@ -3818,7 +3819,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m -# CONFIG_SENSORS_NCT7904 is not set +CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m |