diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /drivers/Makefile | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
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 1a6930f9726a..cadc64fe8f68 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -99,4 +99,5 @@ obj-$(CONFIG_OF) += of/ | |||
| 99 | obj-$(CONFIG_SSB) += ssb/ | 99 | obj-$(CONFIG_SSB) += ssb/ |
| 100 | obj-$(CONFIG_VIRTIO) += virtio/ | 100 | obj-$(CONFIG_VIRTIO) += virtio/ |
| 101 | obj-$(CONFIG_REGULATOR) += regulator/ | 101 | obj-$(CONFIG_REGULATOR) += regulator/ |
| 102 | obj-$(CONFIG_STAGING) += staging/ | ||
| 102 | obj-$(CONFIG_UWB) += uwb/ | 103 | obj-$(CONFIG_UWB) += uwb/ |