--- /usr/include/linux/i2c-dev.h	2005-05-09 09:32:31.000000000 -0700
+++ linux/i2c-dev.h	2005-05-16 10:58:18.186613849 -0700
@@ -24,6 +24,7 @@
 #ifndef _LINUX_I2C_DEV_H
 #define _LINUX_I2C_DEV_H
 
+#include <linux/i2c.h>
 #include <linux/types.h>
 
 /* Some IOCTL commands are defined in <linux/i2c.h> */
@@ -34,12 +35,12 @@
 	__u8 read_write;
 	__u8 command;
 	__u32 size;
-	union i2c_smbus_data __user *data;
+	union i2c_smbus_data *data;
 };
 
 /* This is the structure as used in the I2C_RDWR ioctl call */
 struct i2c_rdwr_ioctl_data {
-	struct i2c_msg __user *msgs;	/* pointers to i2c_msgs */
+	struct i2c_msg *msgs;	/* pointers to i2c_msgs */
 	__u32 nmsgs;			/* number of i2c_msgs */
 };