diff --git a/[refs] b/[refs] index 2caffb811be8..3ff56926bf09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 100d45970327f78584ff4846deeca14bba511e28 +refs/heads/master: 26f944b2716717aa243f16cd2181f80441153f0d diff --git a/trunk/include/linux/usb/hcd.h b/trunk/include/linux/usb/hcd.h index c5fdb148fc02..608050b2545f 100644 --- a/trunk/include/linux/usb/hcd.h +++ b/trunk/include/linux/usb/hcd.h @@ -135,8 +135,8 @@ struct usb_hcd { unsigned int irq; /* irq allocated */ void __iomem *regs; /* device memory/io */ - u64 rsrc_start; /* memory/io resource start */ - u64 rsrc_len; /* memory/io resource length */ + resource_size_t rsrc_start; /* memory/io resource start */ + resource_size_t rsrc_len; /* memory/io resource length */ unsigned power_budget; /* in mA, 0 = no limit */ /* bandwidth_mutex should be taken before adding or removing