linux-next: manual merge of the gpio tree with the arm-soc tree

From: Stephen Rothwell
Date: Tue Jul 29 2014 - 04:20:09 EST

Hi Linus,

Today's linux-next merge of the gpio tree got a conflict in
arch/arm/mach-tegra/board-paz00.c between commit a0524acc94c9 ("ARM:
tegra: Sort includes alphabetically") from the arm-soc tree and commit
0a6d315827ee ("gpio: split gpiod board registration into machine
header") from the gpio tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-tegra/board-paz00.c
index bb4782a32713,91fd858ced0d..000000000000
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -17,10 -17,9 +17,10 @@@

- #include <linux/gpio/driver.h>
-#include <linux/platform_device.h>
+ #include <linux/gpio/machine.h>
+#include <linux/platform_device.h>
#include <linux/rfkill-gpio.h>
#include "board.h"

static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {

Attachment: signature.asc
Description: PGP signature