On Wed, Jun 15, 2011 at 12:42:02PM +0200, Linus Walleij wrote: > From: Linus Walleij <[email protected]> > > There was a missing struct item in the kerneldoc, add it and fix > another pretty-printing formatting issue with a missing space.
weird, it didn't apply to 3.0-rc4. i'll let the two things in one patch slide for this one. > Signed-off-by: Linus Walleij <[email protected]> > --- > drivers/i2c/busses/i2c-nomadik.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-nomadik.c > b/drivers/i2c/busses/i2c-nomadik.c > index f9b8854..b228e09 100644 > --- a/drivers/i2c/busses/i2c-nomadik.c > +++ b/drivers/i2c/busses/i2c-nomadik.c > @@ -146,6 +146,7 @@ struct i2c_nmk_client { > * @stop: stop condition > * @xfer_complete: acknowledge completion for a I2C message > * @result: controller propogated result > + * @regulator: pointer to i2c regulator > * @busy: Busy doing transfer > */ > struct nmk_i2c_dev { > @@ -509,7 +510,7 @@ static int write_i2c(struct nmk_i2c_dev *dev) > > if (timeout < 0) { > dev_err(&dev->pdev->dev, > - "wait_for_completion_timeout" > + "wait_for_completion_timeout " > "returned %d waiting for event\n", timeout); > status = timeout; > } > -- > 1.7.3.2 > -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
