summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/musb_dma.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-02-24 20:36:31 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-24 20:36:31 +0100
commitf227e08b71b9c273eaa29a57370a3a5b833aa382 (patch)
tree9f1483776a2bde3bb1a6bd744e69acf19f6f3428 /drivers/usb/musb/musb_dma.h
parentpch_uart: Fix DMA channel miss-setting issue. (diff)
parentLinux 2.6.38-rc6 (diff)
downloadlinux-f227e08b71b9c273eaa29a57370a3a5b833aa382.tar.xz
linux-f227e08b71b9c273eaa29a57370a3a5b833aa382.zip
Merge 2.6.38-rc6 into tty-next
This was to resolve a merge issue with drivers/char/Makefile and drivers/tty/serial/68328serial.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb/musb_dma.h')
-rw-r--r--drivers/usb/musb/musb_dma.h3
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 */