aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeshwari Shinde <rajeshwari.s@samsung.com>2013-01-13 19:49:36 +0000
committerMinkyu Kang <mk7.kang@samsung.com>2013-01-14 14:45:30 +0900
commitd04df3c6adf7b025d4f68d4f558975d3beb32544 (patch)
treea75c7d1fe7370de0a53ccb994fc9f73bb62f44a0
parenta2468dedef569863e1243e802fbe3aa7565e1de1 (diff)
downloadu-boot-linaro-stable-d04df3c6adf7b025d4f68d4f558975d3beb32544.tar.gz
I2C: S3C24X0: Resolve build error for VCMA9
This patch resolves the following build errors for I2C driver in VCMA9: In file included from s3c24x0_i2c.c:40:0: s3c24x0_i2c.h:38:17: error: field 'id' has incomplete type s3c24x0_i2c.c:70:39: error: 'CONFIG_MAX_I2C_NUM' undeclared here (not in a function) s3c24x0_i2c.c:70:31: warning: 'i2c_bus' defined but not used [-Wunused-variable] s3c24x0_i2c.c:72:12: warning: 'i2c_busses' defined but not used [-Wunused-variable] Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--drivers/i2c/s3c24x0_i2c.c4
-rw-r--r--drivers/i2c/s3c24x0_i2c.h3
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 */