diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 06:08:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 06:08:14 +0200 |
| commit | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (patch) | |
| tree | 07c04d053322e9913a6b445b2fe00510299e97cf /drivers/Makefile | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6 (diff) | |
| parent | USB: fix up some odd parts due to partial merges (diff) | |
| download | linux-1f419cadff55f548e7356ffebdb9e1b5a8c22275.tar.xz linux-1f419cadff55f548e7356ffebdb9e1b5a8c22275.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 1a109a6dd953..65670be6ff1a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -5,7 +5,7 @@ # Rewritten to use lists instead of if-statements. # -obj-$(CONFIG_PCI) += pci/ +obj-$(CONFIG_PCI) += pci/ usb/ obj-$(CONFIG_PARISC) += parisc/ obj-y += video/ obj-$(CONFIG_ACPI) += acpi/ |