diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/host/isp1362.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/host/isp1362.h')
| -rw-r--r-- | drivers/usb/host/isp1362.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h index 1a253ebf7e50..5151516ea1de 100644 --- a/drivers/usb/host/isp1362.h +++ b/drivers/usb/host/isp1362.h | |||
| @@ -534,8 +534,8 @@ struct isp1362_hcd { | |||
| 534 | 534 | ||
| 535 | /* periodic schedule: isochronous */ | 535 | /* periodic schedule: isochronous */ |
| 536 | struct list_head isoc; | 536 | struct list_head isoc; |
| 537 | int istl_flip:1; | 537 | unsigned int istl_flip:1; |
| 538 | int irq_active:1; | 538 | unsigned int irq_active:1; |
| 539 | 539 | ||
| 540 | /* Schedules for the current frame */ | 540 | /* Schedules for the current frame */ |
| 541 | struct isp1362_ep_queue atl_queue; | 541 | struct isp1362_ep_queue atl_queue; |