lkml.org 
[lkml]   [2012]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the driver-core tree with the mfd tree
Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/gpio/gpio-tps6586x.c between commit fe39f2f4dc84 ("mfd: Implement
tps6586x gpio_to_irq") from the mfd tree and commit 3836309d9346 ("gpio:
remove use of __devinit") from the driver-core tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/gpio/gpio-tps6586x.c
index 62e9e1c,c1b82da..0000000
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@@ -80,15 -80,7 +80,15 @@@ static int tps6586x_gpio_output(struct
val, mask);
}

+static int tps6586x_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
+{
+ struct tps6586x_gpio *tps6586x_gpio = to_tps6586x_gpio(gc);
+
+ return tps6586x_irq_get_virq(tps6586x_gpio->parent,
+ TPS6586X_INT_PLDO_0 + offset);
+}
+
- static int __devinit tps6586x_gpio_probe(struct platform_device *pdev)
+ static int tps6586x_gpio_probe(struct platform_device *pdev)
{
struct tps6586x_platform_data *pdata;
struct tps6586x_gpio *tps6586x_gpio;
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-11-29 05:21    [W:0.028 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site