diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 6fb8dec7c7f5..aefe3b933794 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1538,7 +1538,7 @@ static u8 override_id(struct usb_composite_dev *cdev, u8 *desc)
 	return *desc;
 }
 
-#ifdef CONFIG_V1A
+#if defined(CONFIG_V1A) || defined(CONFIG_V2A)
 static void composite_redriver_work(struct work_struct *data)
 {
 	struct usb_composite_dev	*cdev =  container_of(data, struct usb_composite_dev, redriver_work);
@@ -1658,7 +1658,7 @@ static int composite_bind(struct usb_gadget *gadget)
 		goto fail;
 
 	INFO(cdev, "%s ready\n", composite->name);
-#ifdef CONFIG_V1A
+#if defined(CONFIG_V1A) || defined(CONFIG_V2A)
 	INIT_WORK(&cdev->redriver_work, composite_redriver_work);
 #endif
 	return 0;
diff --git a/drivers/usb/gadget/exynos_ss_udc.c b/drivers/usb/gadget/exynos_ss_udc.c
index ce10f7f8b65c..8824ddd8e4cb 100644
--- a/drivers/usb/gadget/exynos_ss_udc.c
+++ b/drivers/usb/gadget/exynos_ss_udc.c
@@ -2548,7 +2548,7 @@ static void exynos_ss_udc_irq_connectdone(struct exynos_ss_udc *udc)
 	}
 #endif
 #endif
-#ifdef CONFIG_V1A
+#if defined(CONFIG_V1A) || defined(CONFIG_V2A)
 			udc->speed_limit = udc->gadget.speed;
 			printk(KERN_ERR"usb: Update the speed limit value %d \n",udc->speed_limit);
 #endif
diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 979a8dbe5572..9bb1134e9b27 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -405,7 +405,7 @@ struct usb_composite_dev {
 	 */
 	bool				mute_switch;
 	bool				force_disconnect;
-#ifdef CONFIG_V1A
+#if defined(CONFIG_V1A) || defined(CONFIG_V2A)
 	struct work_struct redriver_work;
 #endif
 #endif