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

[Stephen Rothwell]

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-tegra/board-seaboard.h between commit ea5abbd215b7 ("ARM:
7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>") from
the arm tree and commit a697e694aeb8 ("ARM: Tegra: Seaboard board updates
for audio") from the arm-soc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-tegra/board-seaboard.h
index 15b6c57,d06c334..0000000
--- a/arch/arm/mach-tegra/board-seaboard.h
+++ b/arch/arm/mach-tegra/board-seaboard.h
@@@ -17,8 -17,9 +17,11 @@@
  #ifndef _MACH_TEGRA_BOARD_SEABOARD_H
  #define _MACH_TEGRA_BOARD_SEABOARD_H
  
 +#include <mach/gpio-tegra.h>
 +
+ #define SEABOARD_GPIO_TPS6586X(_x_)	(TEGRA_NR_GPIOS + (_x_))
+ #define SEABOARD_GPIO_WM8903(_x_)	(SEABOARD_GPIO_TPS6586X(4) + (_x_))
+ 
  #define TEGRA_GPIO_SD2_CD		TEGRA_GPIO_PI5
  #define TEGRA_GPIO_SD2_WP		TEGRA_GPIO_PH1
  #define TEGRA_GPIO_SD2_POWER		TEGRA_GPIO_PI6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/