diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 17:40:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 17:40:30 -0400 |
| commit | 1f9bd4c96a8e918a86e083706e0d3eb7f030b9a3 (patch) | |
| tree | a840b35ca8c193cb0ec5579de3fac4e4e7f47f11 /drivers/i2c | |
| parent | 00463c1633b6d6a2178d2dc794c0a70ac2f9ce6b (diff) | |
| parent | 7f38aa0f04259d37f26e1e906607f1ebb39c0c5c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (129 commits)
[PATCH] USB Storage: fix Rio Karma eject support build error
USB: Airprime driver improvements to allow full speed EvDO transfers
USB: remove OTG build warning
USB: EHCI update VIA workaround
USB: force root hub resume after power loss
USB: ohci_usb can oops on shutdown
USB: Dealias -110 code (more complete)
USB: Remove unneeded void * casts in core files
USB: u132-hcd: host controller driver for ELAN U132 adapter
USB: ftdi-elan: client driver for ELAN Uxxx adapters
usb serial: support Alcor Micro Corp. USB 2.0 TO RS-232 through pl2303 driver
USB: Moschip 7840 USB-Serial Driver
USB: add PlayStation 2 Trance Vibrator driver
USB: Add ADU support for Ontrak ADU devices
aircable: fix printk format warnings
Add AIRcable USB Bluetooth Dongle Driver
cypress_m8: implement graceful failure handling
cypress_m8: improve control endpoint error handling
cypress_m8: use usb_fill_int_urb where appropriate
cypress_m8: use appropriate URB polling interval
...
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/chips/isp1301_omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index f92505b94c61..182f04953466 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/usb_ch9.h> | 30 | #include <linux/usb_ch9.h> |
| 31 | #include <linux/usb_gadget.h> | 31 | #include <linux/usb_gadget.h> |
| 32 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
| 33 | #include <linux/usb_otg.h> | 33 | #include <linux/usb/otg.h> |
| 34 | #include <linux/i2c.h> | 34 | #include <linux/i2c.h> |
| 35 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
| 36 | 36 | ||