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/asm-avr32 | |
| 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/asm-avr32')
| -rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 4 |
1 files changed, 1 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 * | |||
| 38 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, | 38 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, |
| 39 | unsigned long fbmem_start, unsigned long fbmem_len); | 39 | unsigned long fbmem_start, unsigned long fbmem_len); |
| 40 | 40 | ||
| 41 | struct usba_platform_data { | 41 | struct usba_platform_data; |
| 42 | int vbus_pin; | ||
| 43 | }; | ||
| 44 | struct platform_device * | 42 | struct platform_device * |
| 45 | at32_add_device_usba(unsigned int id, struct usba_platform_data *data); | 43 | at32_add_device_usba(unsigned int id, struct usba_platform_data *data); |
| 46 | 44 | ||