diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/usb/hcd.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/usb/hcd.h')
| -rw-r--r-- | include/linux/usb/hcd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index c5fdb148fc02..608050b2545f 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h | |||
| @@ -135,8 +135,8 @@ struct usb_hcd { | |||
| 135 | 135 | ||
| 136 | unsigned int irq; /* irq allocated */ | 136 | unsigned int irq; /* irq allocated */ |
| 137 | void __iomem *regs; /* device memory/io */ | 137 | void __iomem *regs; /* device memory/io */ |
| 138 | u64 rsrc_start; /* memory/io resource start */ | 138 | resource_size_t rsrc_start; /* memory/io resource start */ |
| 139 | u64 rsrc_len; /* memory/io resource length */ | 139 | resource_size_t rsrc_len; /* memory/io resource length */ |
| 140 | unsigned power_budget; /* in mA, 0 = no limit */ | 140 | unsigned power_budget; /* in mA, 0 = no limit */ |
| 141 | 141 | ||
| 142 | /* bandwidth_mutex should be taken before adding or removing | 142 | /* bandwidth_mutex should be taken before adding or removing |