summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-09-17 02:28:08 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-17 18:50:02 (GMT)
commit8ac2120d90273c590cf7662f03d103519101685b (patch)
treed6bc8969f4ad05168bfbb9bedffea8776d5cdddc
parent393ad299658d8464149820363ee09bdf3fd45566 (diff)
downloadlinux-3.10-8ac2120d90273c590cf7662f03d103519101685b.zip
linux-3.10-8ac2120d90273c590cf7662f03d103519101685b.tar.gz
linux-3.10-8ac2120d90273c590cf7662f03d103519101685b.tar.bz2
[PATCH] i2c: kill an unused i2c_adapter struct member
Kill an unused member of the i2c_adapter structure. This additionally fixes a potential bug, because <linux/i2c.h> doesn't include <linux/config.h>, so different files including <linux/i2c.h> could see a different definition of the i2c_adapter structure, depending on them including <linux/config.h> (or other header files themselves including <linux/config.h>) before <linux/i2c.h>, or not. Credits go to Jörn Engel for pointing me to the problem. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/i2c.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index be35332..3d49a30 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -230,11 +230,6 @@ struct i2c_adapter {
struct device dev; /* the adapter device */
struct class_device class_dev; /* the class device */
-#ifdef CONFIG_PROC_FS
- /* No need to set this when you initialize the adapter */
- int inode;
-#endif /* def CONFIG_PROC_FS */
-
int nr;
struct list_head clients;
struct list_head list;