diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:45:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:45:20 +1100 |
| commit | 85f2e058be04463349f1cf85d7c0d9f6d7492826 (patch) | |
| tree | 1008bd85e2259a18c07c5fc1421a54223d12c2fd /arch | |
| parent | 4028d93b54ecdc17993d52ec284fe369d8d5f288 (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (diff) | |
Merge remote-tracking branch 'alacrity/linux-next'
Conflicts:
drivers/Makefile
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 d5ed94d30aad..9137e5b39a25 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2104,6 +2104,8 @@ source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" +source "drivers/vbus/Kconfig" + endmenu |