diff --git a/target/linux/xburst/files-2.6.31/drivers/usb/gadget/jz4740_udc.h b/target/linux/xburst/files-2.6.31/drivers/usb/gadget/jz4740_udc.h
index 88e04a7b9..510b3ff5c 100755
--- a/target/linux/xburst/files-2.6.31/drivers/usb/gadget/jz4740_udc.h
+++ b/target/linux/xburst/files-2.6.31/drivers/usb/gadget/jz4740_udc.h
@@ -90,32 +90,4 @@ extern struct jz4740_udc *the_controller;
 #define ep_index(EP) 		((EP)->bEndpointAddress&0xF)
 #define usb_set_index(i)	(REG8(USB_REG_INDEX) = (i))
 
-/*-------------------------------------------------------------------------*/
-
-/* 2.5 stuff that's sometimes missing in 2.4 */
-
-#ifndef container_of
-#define	container_of	list_entry
-#endif
-
-#ifndef likely
-#define likely(x)	(x)
-#define unlikely(x)	(x)
-#endif
-
-#ifndef BUG_ON
-#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
-#endif
-
-#ifndef WARN_ON
-#define	WARN_ON(x)	do { } while (0)
-#endif
-
-#ifndef	IRQ_NONE
-typedef void irqreturn_t;
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_RETVAL(x)
-#endif
-
 #endif /* __USB_GADGET_JZ4740_H__ */
diff --git a/target/linux/xburst/patches-2.6.31/104-usb.patch b/target/linux/xburst/patches-2.6.31/104-usb.patch
index f64ac1941..ff6ed2f63 100644
--- a/target/linux/xburst/patches-2.6.31/104-usb.patch
+++ b/target/linux/xburst/patches-2.6.31/104-usb.patch
@@ -93,13 +93,14 @@ diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
 index 7f8e83a..a973ce7 100644
 --- a/drivers/usb/gadget/Kconfig
 +++ b/drivers/usb/gadget/Kconfig
-@@ -121,11 +121,24 @@ choice
+@@ -121,11 +121,25 @@ choice
  #
  # Integrated controllers
  #
 +config USB_GADGET_JZ4740
 +	boolean "JZ4740 UDC"
 +	depends on SOC_JZ4740
++	select USB_GADGET_SELECTED
 +	select USB_GADGET_DUALSPEED
 +	help
 +    	   Select this to support the Ingenic JZ4740 processor