diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 12:10:06 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 12:10:29 -0800 |
| commit | 367576b813ed66a000e66ec18f7082bbc84c05d7 (patch) | |
| tree | cfc804c46533855492d0f2fcd3580db308b739d2 /arch/arm/mach-davinci/usb.c | |
| parent | 16350a7258a3158807f3fafe33f1bb22b8ddd127 (diff) | |
| parent | 0607f8622953541e95030ab011258d9f1f381357 (diff) | |
Merge branch 'for-next' of git://gitorious.org/usb/usb into usb-next
* 'for-next' of git://gitorious.org/usb/usb:
usb: musb: gadget: prevent a NULL pointer dereference
usb: musb: add names for IRQs in structure resource
usb: musb: remove board_data parameter from musb_platform_init()
Diffstat (limited to 'arch/arm/mach-davinci/usb.c')
| -rw-r--r-- | arch/arm/mach-davinci/usb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index 31f0cbea0ca..b0d6b07431c 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -64,10 +64,12 @@ static struct resource usb_resources[] = { { .start = IRQ_USBINT, .flags = IORESOURCE_IRQ, + .name = "mc" }, { /* placeholder for the dedicated CPPI IRQ */ .flags = IORESOURCE_IRQ, + .name = "dma" }, }; |