diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /drivers/Makefile | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
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 a280ab3d0833..2735bde73475 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -57,6 +57,7 @@ obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ | |||
| 57 | obj-$(CONFIG_PARIDE) += block/paride/ | 57 | obj-$(CONFIG_PARIDE) += block/paride/ |
| 58 | obj-$(CONFIG_TC) += tc/ | 58 | obj-$(CONFIG_TC) += tc/ |
| 59 | obj-$(CONFIG_USB) += usb/ | 59 | obj-$(CONFIG_USB) += usb/ |
| 60 | obj-$(CONFIG_USB_MUSB_HDRC) += usb/musb/ | ||
| 60 | obj-$(CONFIG_PCI) += usb/ | 61 | obj-$(CONFIG_PCI) += usb/ |
| 61 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ | 62 | obj-$(CONFIG_USB_GADGET) += usb/gadget/ |
| 62 | obj-$(CONFIG_SERIO) += input/serio/ | 63 | obj-$(CONFIG_SERIO) += input/serio/ |