summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-28 19:05:18 +0200
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-31 11:19:31 +0200
commit3e8bb81fd7969784b344db360363d549fec779ba (patch)
treedfdc8a267b776ccf046a962bb6e3b5803a28f3e5 /drivers/usb/gadget
parent28391717d01634a2c096d1b20365f9db5ccbf9a7 (diff)
ccwmx51: Fix compiler warnings.
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/arcotg_udc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c
index b4ccc3bc3d4f..1577c93c35bb 100644
--- a/drivers/usb/gadget/arcotg_udc.c
+++ b/drivers/usb/gadget/arcotg_udc.c
@@ -2176,7 +2176,9 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
{
int retval = -ENODEV;
unsigned long flags = 0;
+#ifndef CONFIG_USB_OTG
u32 portsc;
+#endif
if (!udc_controller)
return -ENODEV;
@@ -2702,7 +2704,10 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
int ret = -ENODEV;
unsigned int i;
- u32 dccparams, portsc;
+ u32 dccparams;
+#ifndef CONFIG_USB_OTG
+ u32 portsc;
+#endif
if (strcmp(pdev->name, driver_name)) {
VDBG("Wrong device\n");
@@ -2909,7 +2914,9 @@ err1a:
*/
static int __exit fsl_udc_remove(struct platform_device *pdev)
{
+#ifndef CONFIG_USB_OTG
struct resource *res;
+#endif
struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
DECLARE_COMPLETION(done);