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 /drivers/usb/gadget/Kconfig | |
| 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 'drivers/usb/gadget/Kconfig')
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 6f45dd669b33..d681bb27fa58 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -118,10 +118,10 @@ config USB_AMD5536UDC | |||
| 118 | config USB_GADGET_ATMEL_USBA | 118 | config USB_GADGET_ATMEL_USBA |
| 119 | boolean "Atmel USBA" | 119 | boolean "Atmel USBA" |
| 120 | select USB_GADGET_DUALSPEED | 120 | select USB_GADGET_DUALSPEED |
| 121 | depends on AVR32 | 121 | depends on AVR32 || ARCH_AT91CAP9 |
| 122 | help | 122 | help |
| 123 | USBA is the integrated high-speed USB Device controller on | 123 | USBA is the integrated high-speed USB Device controller on |
| 124 | the AT32AP700x processors from Atmel. | 124 | the AT32AP700x and AT91CAP9 processors from Atmel. |
| 125 | 125 | ||
| 126 | config USB_ATMEL_USBA | 126 | config USB_ATMEL_USBA |
| 127 | tristate | 127 | tristate |