diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-04-19 20:38:41 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-04-19 20:38:41 -0400 |
| commit | e1c25dc638db01600069b3f9167d1b35f8d574b5 (patch) | |
| tree | f3b25d6a8344f0d9b7d23c8447d4078a36bb30fd /include | |
| parent | 03414e57ad9875d0c8bfa5a4a65813cb2157372e (diff) | |
| parent | 16a45bc82e61891daec1ffcd057679bdf962aeb8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/usba-2.6.26 into base
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 4 | ||||
| -rw-r--r-- | include/linux/usb/atmel_usba_udc.h | 22 |
2 files changed, 23 insertions, 3 deletions
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h index 7597b0bd2f01..3fea2004f7db 100644 --- a/include/asm-avr32/arch-at32ap/board.h +++ b/include/asm-avr32/arch-at32ap/board.h @@ -38,9 +38,7 @@ struct platform_device * at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, unsigned long fbmem_start, unsigned long fbmem_len); -struct usba_platform_data { - int vbus_pin; -}; +struct usba_platform_data; struct platform_device * at32_add_device_usba(unsigned int id, struct usba_platform_data *data); diff --git a/include/linux/usb/atmel_usba_udc.h b/include/linux/usb/atmel_usba_udc.h new file mode 100644 index 000000000000..6311fa2d9f82 --- /dev/null +++ b/include/linux/usb/atmel_usba_udc.h @@ -0,0 +1,22 @@ +/* + * Platform data definitions for Atmel USBA gadget driver. + */ +#ifndef __LINUX_USB_USBA_H +#define __LINUX_USB_USBA_H + +struct usba_ep_data { + char *name; + int index; + int fifo_size; + int nr_banks; + int can_dma; + int can_isoc; +}; + +struct usba_platform_data { + int vbus_pin; + int num_ep; + struct usba_ep_data ep[0]; +}; + +#endif /* __LINUX_USB_USBA_H */ |