diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 20:19:59 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 20:19:59 (GMT) |
| commit | 5945fba8c596546a075382c42cf35141d1ae6eca (patch) | |
| tree | 81bf2d12cd361401244a43d3468317dda00ed574 /arch/x86/configs/i386_defconfig | |
| parent | 8f74bc5ff0eb20a055e4cb8d390669164ca15cb3 (diff) | |
| parent | d8eb8940417559808fdd0180a4d50f8f0281b822 (diff) | |
| download | linux-5945fba8c596546a075382c42cf35141d1ae6eca.tar.xz | |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build changes from Ingo Molnar:
"Small cleanups and fixes"
* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/kexec: Cleanup KEXEC_VERIFY_SIG Kconfig help text
x86/build/defconfig: Enable USB_EHCI_TT_NEWSCHED=y
x86/build: Fix mkcapflags.sh bash-ism
x86/Kconfig: Simplify X86_UP_APIC handling
x86/Kconfig: Simplify X86_IO_APIC dependencies
x86/Kconfig: Avoid issuing pointless turned off entries to .config
Diffstat (limited to 'arch/x86/configs/i386_defconfig')
| -rw-r--r-- | arch/x86/configs/i386_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 419819d..aaa1118 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig @@ -248,7 +248,7 @@ CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y -# CONFIG_USB_EHCI_TT_NEWSCHED is not set +CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_UHCI_HCD=y CONFIG_USB_PRINTER=y |