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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 4 Oct 2011 11:05:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>,
	Stephen Warren <swarren@...dia.com>,
	Marc Dietrich <marvin24@....de>,
	Olof Johansson <olof@...om.net>
Subject: linux-next: manual merge of the arm-soc tree with the arm tree

Hi Arnd,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-tegra/board-paz00.h between commit ea5abbd215b7 ("ARM:
7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>") from
the arm tree and commit 9aaa15a739a0 ("ARM: tegra: paz00: enable rfkill
for internal wifi card") 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@...b.auug.org.au

diff --cc arch/arm/mach-tegra/board-paz00.h
index 42ce863,86057c3..0000000
--- a/arch/arm/mach-tegra/board-paz00.h
+++ b/arch/arm/mach-tegra/board-paz00.h
@@@ -17,12 -17,18 +17,20 @@@
  #ifndef _MACH_TEGRA_BOARD_PAZ00_H
  #define _MACH_TEGRA_BOARD_PAZ00_H
  
 +#include <mach/gpio-tegra.h>
 +
- #define TEGRA_GPIO_SD1_CD		TEGRA_GPIO_PV5
- #define TEGRA_GPIO_SD1_WP		TEGRA_GPIO_PH1
- #define TEGRA_GPIO_SD1_POWER		TEGRA_GPIO_PT3
- #define TEGRA_ULPI_RST			TEGRA_GPIO_PV0
+ /* SDCARD */
+ #define TEGRA_GPIO_SD1_CD	TEGRA_GPIO_PV5
+ #define TEGRA_GPIO_SD1_WP	TEGRA_GPIO_PH1
+ #define TEGRA_GPIO_SD1_POWER	TEGRA_GPIO_PT3
+ 
+ /* ULPI */
+ #define TEGRA_ULPI_RST		TEGRA_GPIO_PV0
+ 
+ /* WIFI */
+ #define TEGRA_WIFI_PWRN		TEGRA_GPIO_PK5
+ #define TEGRA_WIFI_RST		TEGRA_GPIO_PD1
+ #define TEGRA_WIFI_LED		TEGRA_GPIO_PD0
  
  void paz00_pinmux_init(void);
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/