diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:27:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:27:04 +1100 |
| commit | 01a0b0a4555806ad5753c4ec9b22783f20381a62 (patch) | |
| tree | 1519eb4ab0696c6673aeee6b948c6f60915a6b49 /arch | |
| parent | 28453b0dd37121d3ca47b105ff934e7f831c59a9 (diff) | |
| parent | e0a49cff52601056e49ec9235064b4726c70df52 (diff) | |
Merge remote branch 'alacrity/linux-next'
Conflicts:
include/linux/Kbuild
lib/Kconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8b54096e6d73..294f2cc128b7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2035,6 +2035,8 @@ source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" +source "drivers/vbus/Kconfig" + endmenu |