summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/s3c2410_defconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-14 07:09:59 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-14 07:09:59 +0200
commitbf7c1d95af67254957d1820ac112397001e1a9a9 (patch)
tree3adbfbc15812cd4aad20c1ce708fe33b639e0392 /arch/arm/configs/s3c2410_defconfig
parentusb: typec: remove duplicated include from hd3ss3220.c (diff)
parentLinux 5.4-rc3 (diff)
downloadlinux-bf7c1d95af67254957d1820ac112397001e1a9a9.tar.xz
linux-bf7c1d95af67254957d1820ac112397001e1a9a9.zip
Merge 5.4-rc3 into usb-next
we want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/configs/s3c2410_defconfig')
-rw-r--r--arch/arm/configs/s3c2410_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index 95b5a4ffddea..73ed73a8785a 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -327,7 +327,6 @@ CONFIG_USB_EMI62=m
CONFIG_USB_EMI26=m
CONFIG_USB_ADUTUX=m
CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_LCD=m
CONFIG_USB_CYPRESS_CY7C63=m