diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:32:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:32:51 +1100 |
| commit | e6bd479f11cd8325ab41c8ee511d00b9324d9f87 (patch) | |
| tree | d59fd2150262532381070656aba06c7535ca6617 /arch | |
| parent | dbe1a6281f7c3c460b60253b75ab9447f478fb1f (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (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 e330da21b84f..095bcf00dae4 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 |