diff --git a/[refs] b/[refs] index 07c4ad41c1ad..3f49a285f86f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74bdf22b5c3858b06af46f19d05c23e76c40a3bb +refs/heads/master: 276532ba9666b36974cbe16f303fc8be99c9da17 diff --git a/trunk/include/linux/usb/hcd.h b/trunk/include/linux/usb/hcd.h index a4cd6c58870a..03354d557b79 100644 --- a/trunk/include/linux/usb/hcd.h +++ b/trunk/include/linux/usb/hcd.h @@ -178,7 +178,7 @@ struct usb_hcd { * this structure. */ unsigned long hcd_priv[0] - __attribute__ ((aligned(sizeof(unsigned long)))); + __attribute__ ((aligned(sizeof(s64)))); }; /* 2.4 does this a bit differently ... */