From 317609c7ab63589ffd8930febb2b3560ebc407a6 Mon Sep 17 00:00:00 2001 From: Milind Arun Choudhary Date: Tue, 1 May 2007 23:26:34 +0200 Subject: [PATCH] --- yaml --- r: 53267 b: refs/heads/master c: 35532d20035d04b0ec28508583a56c7a65c5fa47 h: refs/heads/master i: 53265: 5b9bf24460f82c8462a388d694398b831af5d73e 53263: 63a33c06c8568d45deaedc6cc63608ca6ade8266 v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-pxa.c | 2 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4891e9f060bc..db8d26761eff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11de70bd4d40a1a39c1133b260bfbd6306e981d3 +refs/heads/master: 35532d20035d04b0ec28508583a56c7a65c5fa47 diff --git a/trunk/drivers/i2c/busses/i2c-pxa.c b/trunk/drivers/i2c/busses/i2c-pxa.c index 2fc3bcec24d8..c059b27fa881 100644 --- a/trunk/drivers/i2c/busses/i2c-pxa.c +++ b/trunk/drivers/i2c/busses/i2c-pxa.c @@ -838,7 +838,7 @@ static const struct i2c_algorithm i2c_pxa_algorithm = { }; 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, diff --git a/trunk/drivers/i2c/busses/i2c-s3c2410.c b/trunk/drivers/i2c/busses/i2c-s3c2410.c index 556f244aae76..3eb5958f347d 100644 --- a/trunk/drivers/i2c/busses/i2c-s3c2410.c +++ b/trunk/drivers/i2c/busses/i2c-s3c2410.c @@ -570,7 +570,7 @@ static const struct i2c_algorithm s3c24xx_i2c_algorithm = { }; 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",