diff options
| author | Linus Torvalds | 2008-05-26 19:24:06 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-05-26 19:24:06 +0200 |
| commit | 84a881657d391121cd88c37f0a312dec3528fa44 (patch) | |
| tree | b997a21cfa759cc2856197822e34277dbf5538a3 /include/linux | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
| parent | i2c: Align i2c_device_id (diff) | |
| download | kernel-qcow2-linux-84a881657d391121cd88c37f0a312dec3528fa44.tar.gz kernel-qcow2-linux-84a881657d391121cd88c37f0a312dec3528fa44.tar.xz kernel-qcow2-linux-84a881657d391121cd88c37f0a312dec3528fa44.zip | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Align i2c_device_id
tuner: Do not alter i2c_client.name
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mod_devicetable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index d73eceaa7afb..69b2342d5ebb 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -375,7 +375,8 @@ struct virtio_device_id { struct i2c_device_id { char name[I2C_NAME_SIZE]; - kernel_ulong_t driver_data; /* Data private to the driver */ + kernel_ulong_t driver_data /* Data private to the driver */ + __attribute__((aligned(sizeof(kernel_ulong_t)))); }; |