diff options
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/s3c24x0_i2c.c | 4 | ||||
| -rw-r--r-- | drivers/i2c/s3c24x0_i2c.h | 3 | 
2 files changed, 4 insertions, 3 deletions
| diff --git a/drivers/i2c/s3c24x0_i2c.c b/drivers/i2c/s3c24x0_i2c.c index 7ec01ec62..769a2ba5b 100644 --- a/drivers/i2c/s3c24x0_i2c.c +++ b/drivers/i2c/s3c24x0_i2c.c @@ -67,9 +67,11 @@   * variables to live in SRAM   */  static unsigned int g_current_bus __attribute__((section(".data"))); +#ifdef CONFIG_OF_CONTROL +static int i2c_busses __attribute__((section(".data")));  static struct s3c24x0_i2c_bus i2c_bus[CONFIG_MAX_I2C_NUM]  			__attribute__((section(".data"))); -static int i2c_busses __attribute__((section(".data"))); +#endif  #if !(defined CONFIG_EXYNOS4 || defined CONFIG_EXYNOS5)  static int GetI2CSDA(void) diff --git a/drivers/i2c/s3c24x0_i2c.h b/drivers/i2c/s3c24x0_i2c.h index 1243bf1b1..a56d749de 100644 --- a/drivers/i2c/s3c24x0_i2c.h +++ b/drivers/i2c/s3c24x0_i2c.h @@ -35,7 +35,6 @@ struct s3c24x0_i2c_bus {  	int node;	/* device tree node */  	int bus_num;	/* i2c bus number */  	struct s3c24x0_i2c *regs; -	enum periph_id id; +	int id;  }; -  #endif /* _S3C24X0_I2C_H */ |