Merge branch 'pm-cpufreq'

[cascardo/linux.git] / drivers / usb / gadget / udc / s3c2410_udc.c

diff --git a/drivers/usb/gadget/udc/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c
index 5d9aa81..eb3571e 100644 (file)
--- a/drivers/usb/gadget/udc/s3c2410_udc.c
+++ b/drivers/usb/gadget/udc/s3c2410_udc.c
@@ -1691,6 +1691,8 @@ static struct s3c2410_udc memory = {
                        .name           = ep0name,
                        .ops            = &s3c2410_ep_ops,
                        .maxpacket      = EP0_FIFO_SIZE,
+                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_CONTROL,
+                                               USB_EP_CAPS_DIR_ALL),
                },
                .dev            = &memory,
        },
@@ -1702,6 +1704,8 @@ static struct s3c2410_udc memory = {
                        .name           = "ep1-bulk",
                        .ops            = &s3c2410_ep_ops,
                        .maxpacket      = EP_FIFO_SIZE,
+                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                               USB_EP_CAPS_DIR_ALL),
                },
                .dev            = &memory,
                .fifo_size      = EP_FIFO_SIZE,
@@ -1714,6 +1718,8 @@ static struct s3c2410_udc memory = {
                        .name           = "ep2-bulk",
                        .ops            = &s3c2410_ep_ops,
                        .maxpacket      = EP_FIFO_SIZE,
+                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                               USB_EP_CAPS_DIR_ALL),
                },
                .dev            = &memory,
                .fifo_size      = EP_FIFO_SIZE,
@@ -1726,6 +1732,8 @@ static struct s3c2410_udc memory = {
                        .name           = "ep3-bulk",
                        .ops            = &s3c2410_ep_ops,
                        .maxpacket      = EP_FIFO_SIZE,
+                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                               USB_EP_CAPS_DIR_ALL),
                },
                .dev            = &memory,
                .fifo_size      = EP_FIFO_SIZE,
@@ -1738,6 +1746,8 @@ static struct s3c2410_udc memory = {
                        .name           = "ep4-bulk",
                        .ops            = &s3c2410_ep_ops,
                        .maxpacket      = EP_FIFO_SIZE,
+                       .caps           = USB_EP_CAPS(USB_EP_CAPS_TYPE_BULK,
+                                               USB_EP_CAPS_DIR_ALL),
                },
                .dev            = &memory,
                .fifo_size      = EP_FIFO_SIZE,