diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 17:14:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 17:14:57 -0400 |
| commit | 20731945ae743034353a88c307920d1f16cf8ac8 (patch) | |
| tree | 132c796fe3a167dece8cec7a40b1d5dd83a68bc8 /include/linux/mod_devicetable.h | |
| parent | 406119f49d4a6cf8b6eee639128e0575a95065e3 (diff) | |
| parent | a9d1b24d91f91b77db3da8aeacb414764f789b9c (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 2f0299a448f6..7b08c11ec4cc 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -244,4 +244,9 @@ struct pcmcia_device_id { | |||
| 244 | #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 | 244 | #define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200 |
| 245 | #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 | 245 | #define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400 |
| 246 | 246 | ||
| 247 | /* I2C */ | ||
| 248 | struct i2c_device_id { | ||
| 249 | __u16 id; | ||
| 250 | }; | ||
| 251 | |||
| 247 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 252 | #endif /* LINUX_MOD_DEVICETABLE_H */ |