diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 13:15:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 13:15:40 +1000 |
| commit | 3f1c66fddf9a52b5fcd70b20c6f8e191c9dbfb99 (patch) | |
| tree | a641a1f314ed7ff228328cd27bcadd685ac4ba05 /arch | |
| parent | 47b5f770429c13885e2a133da28f8a478109b933 (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (diff) | |
Merge remote branch 'alacrity/linux-next'
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 dcb0593b4a66..981bdf2dd1af 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2072,6 +2072,8 @@ source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" +source "drivers/vbus/Kconfig" + endmenu |