diff options
| author | Andy Green <andy.green@linaro.org> | 2012-06-07 11:10:30 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-22 09:39:50 +0800 |
| commit | 7d8ea240cf5f910039e17af235494754424ec719 (patch) | |
| tree | b25da17af8e3cccf198aa1ca33cbc1dcb834c1d6 /drivers/usb | |
| parent | a3d711ed1c98a87b38e5e45660c4870ab6437a57 (diff) | |
| download | panda-7d8ea240cf5f910039e17af235494754424ec719.tar.gz | |
uplevel 3.4 rc2 fixes
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/musb/musb_dma.h | 2 | ||||
| -rw-r--r-- | drivers/usb/musb/musbhsdma.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h index 3a97c4e2d4f..24d39210d4a 100644 --- a/drivers/usb/musb/musb_dma.h +++ b/drivers/usb/musb/musb_dma.h @@ -178,7 +178,7 @@ struct dma_controller { extern void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit); -extern struct dma_controller *__init +extern struct dma_controller *__devinit dma_controller_create(struct musb *, void __iomem *); extern void dma_controller_destroy(struct dma_controller *); diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 57a608584e1..444b9ee0649 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c @@ -380,7 +380,7 @@ void dma_controller_destroy(struct dma_controller *c) kfree(controller); } -struct dma_controller *__init +struct dma_controller *__devinit dma_controller_create(struct musb *musb, void __iomem *base) { struct musb_dma_controller *controller; |