diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:30:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:30:03 -0400 |
| commit | 060ec6f2fb3c8abb85927758de8ac5d1018e6a43 (patch) | |
| tree | 14d451f638805a4db17d6cf38d5003220b1314df /drivers | |
| parent | 0d1782144e81faf6203075c5fcd0a2f0db91af5b (diff) | |
| parent | 0f1482fdd7e5efc473335b92f350027b8f1519fb (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix lh7a40x_udc.c
[ARM] Fix warning in consistent.c
[ARM] Fix warnings in arch/arm/kernel/setup.c
[ARM] Fix ecard.c resource warnings.
[ARM] Fix ISA IRQ resources
[ARM] Fix bad asm instruction in proc-arm925.S
[ARM] More missing proc-macros.S includes
[ARM] 3708/2: fix SMP build after section ioremap changes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/lh7a40x_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index bb22b7e82877..36db72579377 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
| @@ -2143,7 +2143,7 @@ static int lh7a40x_udc_remove(struct platform_device *pdev) | |||
| 2143 | 2143 | ||
| 2144 | static struct platform_driver udc_driver = { | 2144 | static struct platform_driver udc_driver = { |
| 2145 | .probe = lh7a40x_udc_probe, | 2145 | .probe = lh7a40x_udc_probe, |
| 2146 | .remove = lh7a40x_udc_remove | 2146 | .remove = lh7a40x_udc_remove, |
| 2147 | /* FIXME power management support */ | 2147 | /* FIXME power management support */ |
| 2148 | /* .suspend = ... disable UDC */ | 2148 | /* .suspend = ... disable UDC */ |
| 2149 | /* .resume = ... re-enable UDC */ | 2149 | /* .resume = ... re-enable UDC */ |