From: Arnd Bergmann Date: Thu, 20 Nov 2014 16:45:43 +0000 (+0100) Subject: Merge tag 'sti-defconfig-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4aaef61998b4e671ea395279f7d32939e4d6bb0;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'sti-defconfig-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/defconfig Pull "STi defconfig updates for v3.19" from Maxime Coquelin: Highlights: ----------- - Enable ST EHCI and OHCI USB drivers - Enable STiH416 and STiH415 USB2 PHY driver * tag 'sti-defconfig-for-v3.19-1' of git://git.stlinux.com/devel/kernel/linux-sti: ARM: multi_v7_defconfig: Enable stih415/6 usb2 phy driver. ARM: multi_v7_defconfig: Enable st ohci and ehci HCD drivers. Signed-off-by: Arnd Bergmann --- d4aaef61998b4e671ea395279f7d32939e4d6bb0 diff --cc arch/arm/configs/multi_v7_defconfig index b4331cf88db1,e13ab7e3020e..2826448d4a57 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -436,14 -426,10 +438,15 @@@ CONFIG_PWM_VT8500= CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y CONFIG_PHY_MIPHY365X=y + CONFIG_PHY_STIH41X_USB=y CONFIG_PHY_SUN4I_USB=y CONFIG_EXT4_FS=y +CONFIG_AUTOFS4_FS=y +CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y +CONFIG_NTFS_FS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_UBIFS_FS=y CONFIG_TMPFS=y CONFIG_SQUASHFS=y CONFIG_SQUASHFS_LZO=y