diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /include/linux/i2c-dev.h | |
parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'include/linux/i2c-dev.h')
-rw-r--r-- | include/linux/i2c-dev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h index d228230ffe5d..541695679762 100644 --- a/include/linux/i2c-dev.h +++ b/include/linux/i2c-dev.h | |||
@@ -25,6 +25,7 @@ | |||
25 | #define _LINUX_I2C_DEV_H | 25 | #define _LINUX_I2C_DEV_H |
26 | 26 | ||
27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | #include <linux/compiler.h> | ||
28 | 29 | ||
29 | /* Some IOCTL commands are defined in <linux/i2c.h> */ | 30 | /* Some IOCTL commands are defined in <linux/i2c.h> */ |
30 | /* Note: 10-bit addresses are NOT supported! */ | 31 | /* Note: 10-bit addresses are NOT supported! */ |