diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-04-25 18:32:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-25 18:32:12 -0700 |
commit | 7366d36cb967d7a3ac324c789a8b718e61d01b31 (patch) | |
tree | 131671cdfb498727ed64bf49d52c846743e31a6d | |
parent | 2c6e75999000ebc942526466dbd0de37bfac73a4 (diff) | |
download | kernel_samsung_smdk4412-7366d36cb967d7a3ac324c789a8b718e61d01b31.tar.gz kernel_samsung_smdk4412-7366d36cb967d7a3ac324c789a8b718e61d01b31.tar.bz2 kernel_samsung_smdk4412-7366d36cb967d7a3ac324c789a8b718e61d01b31.zip |
[PATCH] ppc annotations: i2c-mpc
Usual iomem annotations and NULL noise removal.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 75b8d867dae..6f33496d31c 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -55,7 +55,7 @@ #define CSR_RXAK 0x01 struct mpc_i2c { - char *base; + void __iomem *base; u32 interrupt; wait_queue_head_t queue; struct i2c_adapter adap; @@ -444,7 +444,7 @@ static int fsl_i2c_probe(struct device *device) fail_add: if (i2c->irq != 0) - free_irq(i2c->irq, 0); + free_irq(i2c->irq, NULL); fail_irq: iounmap(i2c->base); fail_map: |