diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-07 15:00:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-07 15:00:23 +1100 |
| commit | 8fbe036144aa515f8dabdc28aac1c3803fb03aef (patch) | |
| tree | bab70c06b3cbb11cda283850be2978a92e642846 /arch | |
| parent | d0c3040da46b50041b16349e4dd2d71f0bd99e7b (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 7ba709ea87ae..4b07c7408433 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2105,6 +2105,8 @@ source "drivers/pcmcia/Kconfig" source "drivers/pci/hotplug/Kconfig" +source "drivers/vbus/Kconfig" + endmenu |