commit 3a64366cb5c0b54ceb96a8ea86ec154e2129684bAuthor: Philipp Zabel <philipp.zabel@gmail.com>Date: Thu Jul 3 19:23:21 2008 +0200 usb gadget: make g_ether recognize pxa25x_udc again after the name change "ether gadget: controller 'pxa25x_udc' not recognized" usb_gadget_controller_number returned 0 for pxa25x since the driver was renamed without fixing the code in the gadgets. gadget_is_pxa should be renamed to gadget_is_pxa25x to avoid any confusion, but I'd like to do that after the next merge so that this patch can be rolled into [ARM] 5120/1 without causing conflicts. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.hindex f7f159c..42051c1 100644--- a/drivers/usb/gadget/gadget_chips.h+++ b/drivers/usb/gadget/gadget_chips.h@@ -30,7 +30,7 @@ #endif #ifdef CONFIG_USB_GADGET_PXA2XX-#define gadget_is_pxa(g) !strcmp("pxa2xx_udc", (g)->name)+#define gadget_is_pxa(g) !strcmp("pxa25x_udc", (g)->name) #else #define gadget_is_pxa(g) 0 #endif