X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Farm%2Fmach-lh7a40x%2Farch-lpd7a40x.c;h=bd82bebce5cf5db20d5fe6b81955a1d0b2ec1c2c;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=9e0bf6c18234812f1d2db7c787239197346f5cbb;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index 9e0bf6c18..bd82bebce 100644
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -45,7 +45,6 @@ static struct platform_device smc91x_device = {
 	.resource	= smc91x_resources,
 };
 
-#if 0
 static struct resource lh7a40x_usbclient_resources[] = {
 	[0] = {
 		.start	= USB_PHYS,
@@ -53,8 +52,8 @@ static struct resource lh7a40x_usbclient_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
-		.start	= IRQ_USB,
-		.end	= IRQ_USB,
+		.start	= IRQ_USBINTR,
+		.end	= IRQ_USBINTR,
 		.flags	= IORESOURCE_IRQ,
 	},
 };
@@ -62,7 +61,7 @@ static struct resource lh7a40x_usbclient_resources[] = {
 static u64 lh7a40x_usbclient_dma_mask = 0xffffffffUL;
 
 static struct platform_device lh7a40x_usbclient_device = {
-	.name		= "lh7a40x-udc",
+	.name		= "lh7a40x_udc",
 	.id		= 0,
 	.dev		= {
 		.dma_mask = &lh7a40x_usbclient_dma_mask,
@@ -71,7 +70,6 @@ static struct platform_device lh7a40x_usbclient_device = {
 	.num_resources	= ARRAY_SIZE (lh7a40x_usbclient_resources),
 	.resource	= lh7a40x_usbclient_resources,
 };
-#endif
 
 #if defined (CONFIG_ARCH_LH7A404)
 
@@ -105,8 +103,7 @@ static struct platform_device lh7a404_usbhost_device = {
 
 static struct platform_device *lpd7a40x_devs[] __initdata = {
 	&smc91x_device,
-/*	&lh7a40x_usbclient_device, */
-
+	&lh7a40x_usbclient_device,
 #if defined (CONFIG_ARCH_LH7A404)
 	&lh7a404_usbhost_device,
 #endif