diff --git a/[refs] b/[refs] index 9d67cf1e461f..c84f4f337c98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cf2503c6801a69fee25030475eceeefb36d1b56 +refs/heads/master: 15a1d5c9271219db2f1bc448247fb8ccbcc08418 diff --git a/trunk/drivers/usb/gadget/m66592-udc.c b/trunk/drivers/usb/gadget/m66592-udc.c index 611130c8983b..c0a962bb5f25 100644 --- a/trunk/drivers/usb/gadget/m66592-udc.c +++ b/trunk/drivers/usb/gadget/m66592-udc.c @@ -44,7 +44,7 @@ MODULE_DESCRIPTION("M66592 USB gadget driiver"); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Yoshihiro Shimoda"); -#define DRIVER_VERSION "9 May 2007" +#define DRIVER_VERSION "29 May 2007" /* module parameters */ static unsigned short clock = M66592_XTAL24; @@ -1567,7 +1567,7 @@ static int __init m66592_probe(struct platform_device *pdev) m66592->bi_bufnum = M66592_BASE_BUFNUM; - ret = request_irq(irq, m66592_irq, SA_INTERRUPT | SA_SHIRQ, + ret = request_irq(irq, m66592_irq, IRQF_DISABLED | IRQF_SHARED, udc_name, m66592); if (ret < 0) { printk(KERN_ERR "request_irq error (%d)\n", ret);