diff options
| author | Linus Torvalds | 2011-02-10 21:20:40 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-02-10 21:20:40 +0100 |
| commit | 67d019528e5c2693145217cf18a507689980d2a4 (patch) | |
| tree | 77191261468d37b069009887c1ab11afd93e2952 /drivers/usb/musb/musb_dma.h | |
| parent | Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
| parent | USB: cdc-acm: Adding second ACM channel support for Nokia N8 (diff) | |
| download | kernel-qcow2-linux-67d019528e5c2693145217cf18a507689980d2a4.tar.gz kernel-qcow2-linux-67d019528e5c2693145217cf18a507689980d2a4.tar.xz kernel-qcow2-linux-67d019528e5c2693145217cf18a507689980d2a4.zip | |
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (21 commits)
USB: cdc-acm: Adding second ACM channel support for Nokia N8
USB, Mass Storage, composite, gadget: Fix build failure and memset of a struct
USB: Fix trout build failure with ci13xxx_msm gadget
USB: EHCI: fix scheduling while atomic during suspend
USB: usb-storage: unusual_devs entry for Coby MP3 player
USB: ftdi_sio: Add VID=0x0647, PID=0x0100 for Acton Research spectrograph
USB: fix race between root-hub resume and wakeup requests
USB: prevent buggy hubs from crashing the USB stack
usb: r8a66597-udc: Fixed bufnum of Bulk
USB: ftdi_sio: add ST Micro Connect Lite uart support
USB: Storage: Add unusual_devs entry for VTech Kidizoom
USB SL811HS HCD: Fix memory leak in sl811h_urb_enqueue()
USB: ti_usb: fix module removal
USB: io_edgeport: fix the reported firmware major and minor
usb: ehci-omap: Show fatal probing time errors to end user
usb: musb: introduce api for dma code to check compatibility with usb request
usb: musb: maintain three states for buffer mappings instead of two
usb: musb: disable double buffering when it's broken
usb: musb: hsdma: change back to use musb_read/writew
usb: musb: core: fix IRQ check
...
Diffstat (limited to 'drivers/usb/musb/musb_dma.h')
| -rw-r--r-- | drivers/usb/musb/musb_dma.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h index 916065ba9e70..3a97c4e2d4f5 100644 --- a/drivers/usb/musb/musb_dma.h +++ b/drivers/usb/musb/musb_dma.h @@ -169,6 +169,9 @@ struct dma_controller { dma_addr_t dma_addr, u32 length); int (*channel_abort)(struct dma_channel *); + int (*is_compatible)(struct dma_channel *channel, + u16 maxpacket, + void *buf, u32 length); }; /* called after channel_program(), may indicate a fault */ |