[Regression SRU Saucy] Built-in ohci-pci

[Stefan Bader]

>From d9ee42d9e316bbaaf7595d630315af35e6856037 Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader at canonical.com>
Date: Wed, 4 Dec 2013 11:59:46 +0100
Subject: [PATCH] UBUNTU: (config) Built-in ohci-pci

This was separated from the ohci-hcd driver in:

  commit c1117afb85890adf4073c7ff18ebcb4d0495e6af
  Author: Manjunath Goudar <manjunath.goudar at linaro.org>
  Date:   Tue May 28 18:34:51 2013 +0530

    USB: OHCI: make ohci-pci a separate driver

There is a similar split for the EHCI driver (though the option there
is USB_EHCI_PCI, without the HCD) which is set to y and for XHCI the
PCI part always gets attached to the main XHCI_HCD module based on
CONFIG_PCI. That driver also is built-in.

Without that change USB keyboards will not work before the module gets
loaded and that is not done in the debian installer. So installations
(at least server image) cannot be controlled from a USB keyboard (which
includes virtual KVM access (IPMI).

BugLink: http://bugs.launchpad.net/bugs/1244176

Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
---
 debian.master/abi/3.11.0-14.21/modules.ignore |    1 +
 debian.master/config/config.common.ubuntu     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 debian.master/abi/3.11.0-14.21/modules.ignore

diff --git a/debian.master/abi/3.11.0-14.21/modules.ignore b/debian.master/abi/3.11.0-14.21/modules.ignore
new file mode 100644
index 0000000..70f4968
--- /dev/null
+++ b/debian.master/abi/3.11.0-14.21/modules.ignore
@@ -0,0 +1 @@
+ohci-pci
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index df08a24..6ae71b8f 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6472,7 +6472,7 @@ CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
-CONFIG_USB_OHCI_HCD_PCI=m
+CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-- 
1.7.9.5