diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-05 02:46:08 -0400 |
| commit | 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00 (patch) | |
| tree | a9e7f0563cef296b24c53b20dbb388ec5c210172 /drivers/usb/gadget/Kconfig | |
| parent | 1c14e6cecb1811543b1016f27e5d308fbea8c08a (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/serial_sci.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 649c0c5f7158..591ae9fde199 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -295,6 +295,7 @@ config USB_GADGET_S3C_HSOTG | |||
| 295 | boolean "S3C HS/OtG USB Device controller" | 295 | boolean "S3C HS/OtG USB Device controller" |
| 296 | depends on S3C_DEV_USB_HSOTG | 296 | depends on S3C_DEV_USB_HSOTG |
| 297 | select USB_GADGET_S3C_HSOTG_PIO | 297 | select USB_GADGET_S3C_HSOTG_PIO |
| 298 | select USB_GADGET_DUALSPEED | ||
| 298 | help | 299 | help |
| 299 | The Samsung S3C64XX USB2.0 high-speed gadget controller | 300 | The Samsung S3C64XX USB2.0 high-speed gadget controller |
| 300 | integrated into the S3C64XX series SoC. | 301 | integrated into the S3C64XX series SoC. |