diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-18 12:17:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-18 12:17:27 +1100 |
| commit | 29788be06538036f4226ef12c65399ed867bc8d3 (patch) | |
| tree | 045874e2e1d4ce4bb35798f6ec9ee0e0a46c2ebe /arch | |
| parent | 4e32ab5bfbe654930afc66e3597e0cb9764b5f8e (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (diff) | |
Merge remote branch 'alacrity/linux-next'
Conflicts:
include/linux/Kbuild
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 e8327686d3c5..bd05d2a098da 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2064,6 +2064,8 @@ source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" +source "drivers/vbus/Kconfig" + endmenu |