diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /include/linux/mod_devicetable.h | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
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 |