kernel: configs: set USB_CONFIG_F_FS in distro.config

BugLink: http://bugs.launchpad.net/bugs/1763040
We initially add it to arch/arm64/defconfig, however USB_CONFIG_F_FS depends on
USB_CONFIGFS which is not set in arch/arm64/defconfig, so doing a savedefconfig
would prune it. Since we have USB_CONFIGFS in kernel/configs/distro.config , it
is better to set USB_CONFIG_F_FS there as well.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
(cherry picked from commit 3c0bd6e79736c381322e9d25e87812d97f4a7104
http://git.linaro.org/landing-teams/working/qualcomm/kernel.git release/qcomlt-4.14)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index fd2f617ac9a2cf593cba0b78508d453bfec533b1..e0ddaf57294304d5840d777140f468c9c6e9cf5d 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -613,7 +613,6 @@ CONFIG_OVERLAY_FS=m
 CONFIG_VFAT_FS=y
 CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_NFS_FS=y

diff --git a/kernel/configs/distro.config b/kernel/configs/distro.config
index b287f81b0afcb2bf26a898c15871dd99929f13a6..fa852812413943ee41da6e0f9c807f0525685730 100644 (file)
--- a/kernel/configs/distro.config
+++ b/kernel/configs/distro.config
@@ -114,6 +114,7 @@ CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_MASS_STORAGE=m