Merge commit 'v2.6.29-rc1' into timers/urgent

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/memstick.h b/include/linux/memstick.h
index d0c37e682234..690c35a9d4cc 100644
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
@@ -100,8 +100,8 @@ struct mspro_param_register {
 #define MEMSTICK_SYS_PAR8   0x40
 #define MEMSTICK_SYS_SERIAL 0x80
 
-        unsigned short data_count;
-        unsigned int   data_address;
+        __be16 data_count;
+        __be32 data_address;
         unsigned char  tpc_param;
 } __attribute__((packed));