From 2bb3fb3938c86990007de97a54b3f02214f169ee Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 20 Sep 2014 02:38:04 +0000 Subject: [PATCH] [mips*/octeon] Enable OCTEON_USB, USB_EHCI_HCD, USB_OHCI_HCD, and USB_OCTEON_EHCI, USB_OCTEON_OHCI (Closes: #762066). svn path=/dists/sid/linux/; revision=21881 --- debian/changelog | 4 ++++ debian/config/kernelarch-mips/config.octeon | 13 +++++++++++++ .../installer/mips/modules/mips-octeon/usb-modules | 1 + 3 files changed, 18 insertions(+) diff --git a/debian/changelog b/debian/changelog index e514567a8..3d5f04050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ linux (3.16.3-2) UNRELEASED; urgency=medium - block: Change IOSCHED_DEADLINE to module - gpu: Disable VGA_ARB + [ Aurelien Jarno ] + * [mips*/octeon] Enable OCTEON_USB, USB_EHCI_HCD, USB_OHCI_HCD, + and USB_OCTEON_EHCI, USB_OCTEON_OHCI (Closes: #762066). + -- Ben Hutchings Fri, 19 Sep 2014 16:07:34 +0100 linux (3.16.3-1) unstable; urgency=medium diff --git a/debian/config/kernelarch-mips/config.octeon b/debian/config/kernelarch-mips/config.octeon index 6f97995f0..713a4c5d3 100644 --- a/debian/config/kernelarch-mips/config.octeon +++ b/debian/config/kernelarch-mips/config.octeon @@ -104,6 +104,11 @@ CONFIG_RTC_DRV_DS1307=y ## CONFIG_OCTEON_ETHERNET=y +## +## file: drivers/staging/octeon-usb/Kconfig +## +CONFIG_OCTEON_USB=y + ## ## file: drivers/tty/serial/8250/Kconfig ## @@ -112,6 +117,14 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +## +## file: drivers/usb/host/Kconfig +## +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_OCTEON_EHCI=m +CONFIG_USB_OCTEON_OHCI=m +CONFIG_USB_OHCI_HCD=m + ## ## file: kernel/power/Kconfig ## diff --git a/debian/installer/mips/modules/mips-octeon/usb-modules b/debian/installer/mips/modules/mips-octeon/usb-modules index c598dedd8..6c3464a6c 100644 --- a/debian/installer/mips/modules/mips-octeon/usb-modules +++ b/debian/installer/mips/modules/mips-octeon/usb-modules @@ -1 +1,2 @@ #include +octeon-hcd