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/i2c-dev.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/i2c-dev.h')
| -rw-r--r-- | include/linux/i2c-dev.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h index 541695679762..81c229a0fbca 100644 --- a/include/linux/i2c-dev.h +++ b/include/linux/i2c-dev.h | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | /* $Id: i2c-dev.h,v 1.13 2003/01/21 08:08:16 kmalkki Exp $ */ | ||
| 23 | |||
| 24 | #ifndef _LINUX_I2C_DEV_H | 22 | #ifndef _LINUX_I2C_DEV_H |
| 25 | #define _LINUX_I2C_DEV_H | 23 | #define _LINUX_I2C_DEV_H |
| 26 | 24 | ||