diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /include/linux/mod_devicetable.h | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index eb71b45fdf5a..97b91d1abb43 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -135,6 +135,7 @@ struct usb_device_id { | |||
| 135 | 135 | ||
| 136 | struct hid_device_id { | 136 | struct hid_device_id { |
| 137 | __u16 bus; | 137 | __u16 bus; |
| 138 | __u16 pad1; | ||
| 138 | __u32 vendor; | 139 | __u32 vendor; |
| 139 | __u32 product; | 140 | __u32 product; |
| 140 | kernel_ulong_t driver_data | 141 | kernel_ulong_t driver_data |