From: Milind Arun Choudhary Subject: i2c: SPIN_LOCK_UNLOCKED cleanup SPIN_LOCK_UNLOCKED cleanup, use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Milind Arun Choudhary Signed-off-by: Jean Delvare --- drivers/i2c/busses/i2c-pxa.c | 2 +- drivers/i2c/busses/i2c-s3c2410.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.21-rc6.orig/drivers/i2c/busses/i2c-pxa.c 2007-04-18 13:14:28.000000000 +0200 +++ linux-2.6.21-rc6/drivers/i2c/busses/i2c-pxa.c 2007-04-19 09:23:54.000000000 +0200 @@ -838,7 +838,7 @@ static const struct i2c_algorithm i2c_px }; static struct pxa_i2c i2c_pxa = { - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(i2c_pxa.lock), .adap = { .owner = THIS_MODULE, .algo = &i2c_pxa_algorithm, --- linux-2.6.21-rc6.orig/drivers/i2c/busses/i2c-s3c2410.c 2007-02-21 08:34:22.000000000 +0100 +++ linux-2.6.21-rc6/drivers/i2c/busses/i2c-s3c2410.c 2007-04-19 09:23:55.000000000 +0200 @@ -570,7 +570,7 @@ static const struct i2c_algorithm s3c24x }; static struct s3c24xx_i2c s3c24xx_i2c = { - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(s3c24xx_i2c.lock), .wait = __WAIT_QUEUE_HEAD_INITIALIZER(s3c24xx_i2c.wait), .adap = { .name = "s3c2410-i2c",