diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-10 03:16:27 -0500 |
| commit | 4ecd33d930591d41fe356160593a9076467b961c (patch) | |
| tree | b9051a334540bbce38db1b2b03cebb4cf1d51f73 /include/linux/mod_devicetable.h | |
| parent | 7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff) | |
| parent | f7160c7573615ec82c691e294cf80d920b5d588d (diff) | |
Merge commit 'v2.6.28-rc4' into x86/apic
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 |