Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / musb / cppi_dma.c

diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index f5a65ff0ac2bb467b7b5fd9817bd1fa16a4434cf..de55a3c3259ac1a403e3c4d730781eeb63fda77c 100644 (file)
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -1308,7 +1308,7 @@ dma_controller_create(struct musb *musb, void __iomem *mregs)
        struct cppi             *controller;
        struct device           *dev = musb->controller;
        struct platform_device  *pdev = to_platform_device(dev);
-       int                     irq = platform_get_irq(pdev, 1);
+       int                     irq = platform_get_irq_byname(pdev, "dma");
 
        controller = kzalloc(sizeof *controller, GFP_KERNEL);
        if (!controller)