X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fhost%2Fsl811-hcd.c;h=a92343052751c06b57cd99dbc50ed607e17b5eae;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=fa34092bbcde1e82ac9338d7a2366aea48c2e1d3;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index fa34092bb..a92343052 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -31,6 +31,7 @@
 #undef	VERBOSE
 #undef	PACKET_TRACE
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -45,7 +46,7 @@
 #include <linux/list.h>
 #include <linux/interrupt.h>
 #include <linux/usb.h>
-#include <linux/usb/sl811.h>
+#include <linux/usb_sl811.h>
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
@@ -1683,13 +1684,9 @@ sl811h_probe(struct platform_device *dev)
 		if (!addr || !data)
 			return -ENODEV;
 		ioaddr = 1;
-		/*
-		 * NOTE: 64-bit resource->start is getting truncated
-		 * to avoid compiler warning, assuming that ->start
-		 * is always 32-bit for this case
-		 */
-		addr_reg = (void __iomem *) (unsigned long) addr->start;
-		data_reg = (void __iomem *) (unsigned long) data->start;
+
+		addr_reg = (void __iomem *) addr->start;
+		data_reg = (void __iomem *) data->start;
 	} else {
 		addr_reg = ioremap(addr->start, 1);
 		if (addr_reg == NULL) {
@@ -1749,7 +1746,7 @@ sl811h_probe(struct platform_device *dev)
 	 * was on a system with single edge triggering, so most sorts of
 	 * triggering arrangement should work.
 	 */
-	retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+	retval = usb_add_hcd(hcd, irq, SA_INTERRUPT | SA_SHIRQ);
 	if (retval != 0)
 		goto err6;