diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:25:28 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:26:15 -0400 |
| commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
| tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /drivers/usb/otg/Makefile | |
| parent | 19943b0e30b05d42e494ae6fef78156ebc8c637e (diff) | |
| parent | ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'drivers/usb/otg/Makefile')
| -rw-r--r-- | drivers/usb/otg/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile index 6d1abdd3c0a..20816785652 100644 --- a/drivers/usb/otg/Makefile +++ b/drivers/usb/otg/Makefile | |||
| @@ -9,7 +9,6 @@ obj-$(CONFIG_USB_OTG_UTILS) += otg.o | |||
| 9 | obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o | 9 | obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o |
| 10 | obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o | 10 | obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o |
| 11 | obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o | 11 | obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o |
| 12 | obj-$(CONFIG_USB_LANGWELL_OTG) += langwell_otg.o | ||
| 13 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o | 12 | obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o |
| 14 | 13 | ||
| 15 | ccflags-$(CONFIG_USB_DEBUG) += -DDEBUG | 14 | ccflags-$(CONFIG_USB_DEBUG) += -DDEBUG |