* [PATCH] mfd: Fix WM831x I2C suspend prototype
@ 2010-04-07 12:15 Mark Brown
2010-04-08 9:35 ` Samuel Ortiz
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2010-04-07 12:15 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-kernel, Mark Brown
Sorry about the oversight.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/mfd/wm831x-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index d4331b2..1a968f3 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1767,7 +1767,7 @@ static int wm831x_i2c_remove(struct i2c_client *i2c)
return 0;
}
-static int wm831x_i2c_suspend(struct i2c_client *i2c)
+static int wm831x_i2c_suspend(struct i2c_client *i2c, pm_message_t mesg)
{
struct wm831x *wm831x = i2c_get_clientdata(i2c);
--
1.7.0.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mfd: Fix WM831x I2C suspend prototype
2010-04-07 12:15 [PATCH] mfd: Fix WM831x I2C suspend prototype Mark Brown
@ 2010-04-08 9:35 ` Samuel Ortiz
0 siblings, 0 replies; 2+ messages in thread
From: Samuel Ortiz @ 2010-04-08 9:35 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel
On Wed, Apr 07, 2010 at 01:15:22PM +0100, Mark Brown wrote:
> Sorry about the oversight.
No problem. I wonder how that slipped through my compile tests...
Anyway, I merged it with your last wm831x-core patch.
Cheers,
Samuel.
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm831x-core.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
> index d4331b2..1a968f3 100644
> --- a/drivers/mfd/wm831x-core.c
> +++ b/drivers/mfd/wm831x-core.c
> @@ -1767,7 +1767,7 @@ static int wm831x_i2c_remove(struct i2c_client *i2c)
> return 0;
> }
>
> -static int wm831x_i2c_suspend(struct i2c_client *i2c)
> +static int wm831x_i2c_suspend(struct i2c_client *i2c, pm_message_t mesg)
> {
> struct wm831x *wm831x = i2c_get_clientdata(i2c);
>
> --
> 1.7.0.3
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-08 9:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-07 12:15 [PATCH] mfd: Fix WM831x I2C suspend prototype Mark Brown
2010-04-08 9:35 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).