diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 11:47:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 11:47:46 -0400 |
commit | 6eafa4604cfa109a89524d35d93df11c37bd66b0 (patch) | |
tree | de0eddca052ed01318df559d7cd80211dd57a0fd /include/linux/mod_devicetable.h | |
parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
parent | b9c4decbd9530b0c4c6dc4ad0626af628b79cd53 (diff) |
Merge 3.1-rc4 into staging-next
This resolves a conflict with:
drivers/staging/brcm80211/brcmsmac/types.h
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/mod_devicetable.h')
-rw-r--r-- | include/linux/mod_devicetable.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index ae28e93fd07..468819cdde8 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -405,6 +405,15 @@ struct virtio_device_id { | |||
405 | }; | 405 | }; |
406 | #define VIRTIO_DEV_ANY_ID 0xffffffff | 406 | #define VIRTIO_DEV_ANY_ID 0xffffffff |
407 | 407 | ||
408 | /* | ||
409 | * For Hyper-V devices we use the device guid as the id. | ||
410 | */ | ||
411 | struct hv_vmbus_device_id { | ||
412 | __u8 guid[16]; | ||
413 | kernel_ulong_t driver_data /* Data private to the driver */ | ||
414 | __attribute__((aligned(sizeof(kernel_ulong_t)))); | ||
415 | }; | ||
416 | |||
408 | /* i2c */ | 417 | /* i2c */ |
409 | 418 | ||
410 | #define I2C_NAME_SIZE 20 | 419 | #define I2C_NAME_SIZE 20 |