diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/usb/misc/appledisplay.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/misc/appledisplay.c')
| -rw-r--r-- | drivers/usb/misc/appledisplay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index fc6cc147996f..6b23a1def9fe 100644 --- a/drivers/usb/misc/appledisplay.c +++ b/drivers/usb/misc/appledisplay.c | |||
| @@ -84,7 +84,7 @@ struct appledisplay { | |||
| 84 | static atomic_t count_displays = ATOMIC_INIT(0); | 84 | static atomic_t count_displays = ATOMIC_INIT(0); |
| 85 | static struct workqueue_struct *wq; | 85 | static struct workqueue_struct *wq; |
| 86 | 86 | ||
| 87 | static void appledisplay_complete(struct urb *urb, struct pt_regs *regs) | 87 | static void appledisplay_complete(struct urb *urb) |
| 88 | { | 88 | { |
| 89 | struct appledisplay *pdata = urb->context; | 89 | struct appledisplay *pdata = urb->context; |
| 90 | unsigned long flags; | 90 | unsigned long flags; |