yann@1: Fixes yann@1: yann@1: In file included from fs/compat_ioctl.c:69, yann@1: from arch/ppc64/kernel/ioctl32.c:24: yann@1: include/linux/i2c.h:58: error: array type has incomplete element type yann@1: include/linux/i2c.h:197: error: array type has incomplete element type yann@1: yann@1: when compiling with gcc-4.0. yann@1: yann@1: --- linux-2.6.11.3/include/linux/i2c.h.old 2005-03-19 10:59:09.000000000 -0800 yann@1: +++ linux-2.6.11.3/include/linux/i2c.h 2005-03-19 11:01:37.000000000 -0800 yann@1: @@ -36,7 +36,22 @@ yann@1: yann@1: /* --- General options ------------------------------------------------ */ yann@1: yann@1: -struct i2c_msg; yann@1: +/* yann@1: + * I2C Message - used for pure i2c transaction, also from /dev interface yann@1: + */ yann@1: +struct i2c_msg { yann@1: + __u16 addr; /* slave address */ yann@1: + __u16 flags; yann@1: +#define I2C_M_TEN 0x10 /* we have a ten bit chip address */ yann@1: +#define I2C_M_RD 0x01 yann@1: +#define I2C_M_NOSTART 0x4000 yann@1: +#define I2C_M_REV_DIR_ADDR 0x2000 yann@1: +#define I2C_M_IGNORE_NAK 0x1000 yann@1: +#define I2C_M_NO_RD_ACK 0x0800 yann@1: + __u16 len; /* msg length */ yann@1: + __u8 *buf; /* pointer to msg data */ yann@1: +}; yann@1: + yann@1: struct i2c_algorithm; yann@1: struct i2c_adapter; yann@1: struct i2c_client; yann@1: @@ -379,22 +394,6 @@ yann@1: /* Return 1 if adapter supports everything we need, 0 if not. */ yann@1: extern int i2c_check_functionality (struct i2c_adapter *adap, u32 func); yann@1: yann@1: -/* yann@1: - * I2C Message - used for pure i2c transaction, also from /dev interface yann@1: - */ yann@1: -struct i2c_msg { yann@1: - __u16 addr; /* slave address */ yann@1: - __u16 flags; yann@1: -#define I2C_M_TEN 0x10 /* we have a ten bit chip address */ yann@1: -#define I2C_M_RD 0x01 yann@1: -#define I2C_M_NOSTART 0x4000 yann@1: -#define I2C_M_REV_DIR_ADDR 0x2000 yann@1: -#define I2C_M_IGNORE_NAK 0x1000 yann@1: -#define I2C_M_NO_RD_ACK 0x0800 yann@1: - __u16 len; /* msg length */ yann@1: - __u8 *buf; /* pointer to msg data */ yann@1: -}; yann@1: - yann@1: /* To determine what functionality is present */ yann@1: yann@1: #define I2C_FUNC_I2C 0x00000001