diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
| commit | c4fc108a8275f5eb77c9859725643a6870d20ef6 (patch) | |
| tree | de7ce4af8e49ad2504fc270594124ec8ec874857 /drivers/Makefile | |
| parent | 741854e4f9a23421e194df8d846899172ff393d6 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index fac1e1603097..ea410b6b7644 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | # Rewritten to use lists instead of if-statements. | 5 | # Rewritten to use lists instead of if-statements. |
| 6 | # | 6 | # |
| 7 | 7 | ||
| 8 | obj-$(CONFIG_PCI) += pci/ usb/ | 8 | obj-$(CONFIG_PCI) += pci/ |
| 9 | obj-$(CONFIG_PARISC) += parisc/ | 9 | obj-$(CONFIG_PARISC) += parisc/ |
| 10 | obj-$(CONFIG_RAPIDIO) += rapidio/ | 10 | obj-$(CONFIG_RAPIDIO) += rapidio/ |
| 11 | obj-y += video/ | 11 | obj-y += video/ |
| @@ -49,6 +49,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ | |||
| 49 | obj-$(CONFIG_PARIDE) += block/paride/ | 49 | obj-$(CONFIG_PARIDE) += block/paride/ |
| 50 | obj-$(CONFIG_TC) += tc/ | 50 | obj-$(CONFIG_TC) += tc/ |
| 51 | obj-$(CONFIG_USB) += usb/ | 51 | obj-$(CONFIG_USB) += usb/ |
| 52 | obj-$(CONFIG_PCI) += usb/ | ||
| 52 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ | 53 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ |
| 53 | obj-$(CONFIG_GAMEPORT) += input/gameport/ | 54 | obj-$(CONFIG_GAMEPORT) += input/gameport/ |
| 54 | obj-$(CONFIG_INPUT) += input/ | 55 | obj-$(CONFIG_INPUT) += input/ |