diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-12 11:52:37 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-12 11:52:37 +1100 |
| commit | e0a2d4517abfd1c4d3f5595c0986392dea99b933 (patch) | |
| tree | a2ec92f0f5e52a2ec9834d3dd99ce741930ad779 /drivers/Makefile | |
| parent | c055a148f4d117ff26947bf4ee9ba419090dd57c (diff) | |
| parent | 17d1061f5d87eff7d50942399414845d1f7a8a08 (diff) | |
Merge remote branch 'alacrity/linux-next'
Conflicts:
include/linux/Kbuild
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index f3ebb30f1b7f..7c8acdb2401e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -115,3 +115,4 @@ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/ obj-y += ieee802154/ +obj-y += vbus/ |