git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[sfrench/cifs-2.6.git]
/
include
/
linux
/
mod_devicetable.h
diff --git
a/include/linux/mod_devicetable.h
b/include/linux/mod_devicetable.h
index 2f0299a448f68687e0bf430c3f531f07fbe029d2..7b08c11ec4cc15a4eb829fa0062d18f4ac87a99c 100644
(file)
--- a/
include/linux/mod_devicetable.h
+++ b/
include/linux/mod_devicetable.h
@@
-244,4
+244,9
@@
struct pcmcia_device_id {
#define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200
#define PCMCIA_DEV_ID_MATCH_ANONYMOUS 0x0400
+/* I2C */
+struct i2c_device_id {
+ __u16 id;
+};
+
#endif /* LINUX_MOD_DEVICETABLE_H */