diff options
-rw-r--r-- | drivers/usb/gadget/Kconfig | 8 | ||||
-rw-r--r-- | drivers/usb/gadget/s3c-hsotg.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index ef5075eaaa7a..fbc5607c8cd3 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -294,11 +294,11 @@ config USB_PXA27X | |||
294 | gadget drivers to also be dynamically linked. | 294 | gadget drivers to also be dynamically linked. |
295 | 295 | ||
296 | config USB_S3C_HSOTG | 296 | config USB_S3C_HSOTG |
297 | tristate "S3C HS/OtG USB Device controller" | 297 | depends on ARM |
298 | depends on S3C_DEV_USB_HSOTG | 298 | tristate "Designware/S3C HS/OtG USB Device controller" |
299 | help | 299 | help |
300 | The Samsung S3C64XX USB2.0 high-speed gadget controller | 300 | The Designware USB2.0 high-speed gadget controller |
301 | integrated into the S3C64XX series SoC. | 301 | integrated into many SoCs. |
302 | 302 | ||
303 | config USB_S3C2410 | 303 | config USB_S3C2410 |
304 | tristate "S3C2410 USB Device Controller" | 304 | tristate "S3C2410 USB Device Controller" |
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 83bacf4b409b..8917ec3c336e 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c | |||
@@ -36,8 +36,6 @@ | |||
36 | #include <linux/usb/phy.h> | 36 | #include <linux/usb/phy.h> |
37 | #include <linux/platform_data/s3c-hsotg.h> | 37 | #include <linux/platform_data/s3c-hsotg.h> |
38 | 38 | ||
39 | #include <mach/map.h> | ||
40 | |||
41 | #include "s3c-hsotg.h" | 39 | #include "s3c-hsotg.h" |
42 | 40 | ||
43 | static const char * const s3c_hsotg_supply_names[] = { | 41 | static const char * const s3c_hsotg_supply_names[] = { |