summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-19 08:32:04 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-19 08:32:04 -0400
commitc3c2b77d29fe2057cb4647f2810b6415ff55fadb (patch)
tree0e670b7f53fedfda92998b01e5eb30c4636c0704 /config-generic
parent02587b4efa279dbcc9d7f80fd7636074bb905012 (diff)
downloadkernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.tar.gz
kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.tar.xz
kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.zip
3.1-rc2-git5 snapshot
Make XHCI builtin, add a patch to fix a race in the crypto framework
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index e320aeffa..443b2c114 100644
--- a/config-generic
+++ b/config-generic
@@ -3126,7 +3126,7 @@ CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_HCD_ISO=y
# CONFIG_USB_SL811_CS is not set
# CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
CONFIG_USB_ISP1362_HCD=m