diff --git a/[refs] b/[refs] index f2738a1e58b3..81ba23884bd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17be18c2b5f5c8acd75e4edf1211abf2cfd60fa5 +refs/heads/master: a91befc116f424883602fb7b57b63b5fcfe18719 diff --git a/trunk/include/linux/mod_devicetable.h b/trunk/include/linux/mod_devicetable.h index 5a123774c2e6..468819cdde87 100644 --- a/trunk/include/linux/mod_devicetable.h +++ b/trunk/include/linux/mod_devicetable.h @@ -410,6 +410,8 @@ struct virtio_device_id { */ struct hv_vmbus_device_id { __u8 guid[16]; + kernel_ulong_t driver_data /* Data private to the driver */ + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; /* i2c */