[lkml]   [2013]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the gpio tree with the pm tree
Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpiolib.c between commit 7b1998116bbb ("ACPI / driver core:
Store an ACPI device pointer in struct acpi_dev_node") from the pm tree
and commit f760f1967ee8 ("gpiolib: use dedicated flags for GPIO
properties") from the gpio tree.

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

Stephen Rothwell

diff --cc drivers/gpio/gpiolib.c
index 4e10b10d3ddd,48d1a67ed488..000000000000
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@@ -13,7 -13,7 +13,8 @@@
#include <linux/acpi_gpio.h>
#include <linux/idr.h>
#include <linux/slab.h>
+#include <linux/acpi.h>
+ #include <linux/gpio/driver.h>

#include <trace/events/gpio.h>
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-11-19 03:21    [W:0.054 / U:0.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site