diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/mod_devicetable.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 139d49d2f078..d73eceaa7afb 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
| @@ -368,4 +368,15 @@ struct virtio_device_id { | |||
| 368 | }; | 368 | }; |
| 369 | #define VIRTIO_DEV_ANY_ID 0xffffffff | 369 | #define VIRTIO_DEV_ANY_ID 0xffffffff |
| 370 | 370 | ||
| 371 | /* i2c */ | ||
| 372 | |||
| 373 | #define I2C_NAME_SIZE 20 | ||
| 374 | #define I2C_MODULE_PREFIX "i2c:" | ||
| 375 | |||
| 376 | struct i2c_device_id { | ||
| 377 | char name[I2C_NAME_SIZE]; | ||
| 378 | kernel_ulong_t driver_data; /* Data private to the driver */ | ||
| 379 | }; | ||
| 380 | |||
| 381 | |||
| 371 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 382 | #endif /* LINUX_MOD_DEVICETABLE_H */ |