diff options
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 36336486c88..2de9748ee67 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #undef DEBUG | 22 | #undef DEBUG |
23 | #undef VERBOSE | 23 | #undef VERBOSE |
24 | 24 | ||
25 | #include <linux/config.h> | ||
26 | #include <linux/module.h> | 25 | #include <linux/module.h> |
27 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
28 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
@@ -2819,7 +2818,7 @@ bad_on_1710: | |||
2819 | 2818 | ||
2820 | /* USB general purpose IRQ: ep0, state changes, dma, etc */ | 2819 | /* USB general purpose IRQ: ep0, state changes, dma, etc */ |
2821 | status = request_irq(pdev->resource[1].start, omap_udc_irq, | 2820 | status = request_irq(pdev->resource[1].start, omap_udc_irq, |
2822 | SA_SAMPLE_RANDOM, driver_name, udc); | 2821 | IRQF_SAMPLE_RANDOM, driver_name, udc); |
2823 | if (status != 0) { | 2822 | if (status != 0) { |
2824 | ERR( "can't get irq %ld, err %d\n", | 2823 | ERR( "can't get irq %ld, err %d\n", |
2825 | pdev->resource[1].start, status); | 2824 | pdev->resource[1].start, status); |
@@ -2828,7 +2827,7 @@ bad_on_1710: | |||
2828 | 2827 | ||
2829 | /* USB "non-iso" IRQ (PIO for all but ep0) */ | 2828 | /* USB "non-iso" IRQ (PIO for all but ep0) */ |
2830 | status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, | 2829 | status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, |
2831 | SA_SAMPLE_RANDOM, "omap_udc pio", udc); | 2830 | IRQF_SAMPLE_RANDOM, "omap_udc pio", udc); |
2832 | if (status != 0) { | 2831 | if (status != 0) { |
2833 | ERR( "can't get irq %ld, err %d\n", | 2832 | ERR( "can't get irq %ld, err %d\n", |
2834 | pdev->resource[2].start, status); | 2833 | pdev->resource[2].start, status); |
@@ -2836,7 +2835,7 @@ bad_on_1710: | |||
2836 | } | 2835 | } |
2837 | #ifdef USE_ISO | 2836 | #ifdef USE_ISO |
2838 | status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, | 2837 | status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, |
2839 | SA_INTERRUPT, "omap_udc iso", udc); | 2838 | IRQF_DISABLED, "omap_udc iso", udc); |
2840 | if (status != 0) { | 2839 | if (status != 0) { |
2841 | ERR("can't get irq %ld, err %d\n", | 2840 | ERR("can't get irq %ld, err %d\n", |
2842 | pdev->resource[3].start, status); | 2841 | pdev->resource[3].start, status); |