[kernel] r21881 - in dists/sid/linux/debian: . config/kernelarch-mips installer/mips/modules/mips-octeon

[Aurelien Jarno]

Author: aurel32
Date: Sat Sep 20 02:38:04 2014
New Revision: 21881

Log:
[mips*/octeon] Enable OCTEON_USB, USB_EHCI_HCD, USB_OHCI_HCD,
and USB_OCTEON_EHCI, USB_OCTEON_OHCI (Closes: #762066).

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/kernelarch-mips/config.octeon
   dists/sid/linux/debian/installer/mips/modules/mips-octeon/usb-modules

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sat Sep 20 00:07:14 2014	(r21880)
+++ dists/sid/linux/debian/changelog	Sat Sep 20 02:38:04 2014	(r21881)
@@ -8,6 +8,10 @@
     - 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 <ben at decadent.org.uk>  Fri, 19 Sep 2014 16:07:34 +0100
 
 linux (3.16.3-1) unstable; urgency=medium

Modified: dists/sid/linux/debian/config/kernelarch-mips/config.octeon
==============================================================================
--- dists/sid/linux/debian/config/kernelarch-mips/config.octeon	Sat Sep 20 00:07:14 2014	(r21880)
+++ dists/sid/linux/debian/config/kernelarch-mips/config.octeon	Sat Sep 20 02:38:04 2014	(r21881)
@@ -105,6 +105,11 @@
 CONFIG_OCTEON_ETHERNET=y
 
 ##
+## file: drivers/staging/octeon-usb/Kconfig
+##
+CONFIG_OCTEON_USB=y
+
+##
 ## file: drivers/tty/serial/8250/Kconfig
 ##
 CONFIG_SERIAL_8250=y
@@ -113,6 +118,14 @@
 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
 ##
 # CONFIG_SUSPEND is not set

Modified: dists/sid/linux/debian/installer/mips/modules/mips-octeon/usb-modules
==============================================================================
--- dists/sid/linux/debian/installer/mips/modules/mips-octeon/usb-modules	Sat Sep 20 00:07:14 2014	(r21880)
+++ dists/sid/linux/debian/installer/mips/modules/mips-octeon/usb-modules	Sat Sep 20 02:38:04 2014	(r21881)
@@ -1 +1,2 @@
 #include <usb-modules>
+octeon-hcd