Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 973076ae authored May 08, 2012 by Olof Johansson

Merge branch 'kirkwood_fixes_for_v3.4' of...

Merge branch 'kirkwood_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux-kirkwood into fixes

By Ben Hutchings (1) and Ian Campbell (1)
via Jason Cooper: "ARM: kirkwood: fixes for v3.4"
* 'kirkwood_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux-kirkwood:
  ARM: orion5x: Fix GPIO enable bits for MPP9
  ARM: kirkwood: add missing kexec.h include

parents d48b97b4 48d99f47

arch/arm/mach-kirkwood/board-dt.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		#include <linux/init.h>
		#include <linux/of.h>
		#include <linux/of_platform.h>
		#include <linux/kexec.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/map.h>
		#include <mach/bridge-regs.h>

arch/arm/mach-orion5x/mpp.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,8 +65,8 @@
		#define MPP8_GIGE MPP(8, 0x1, 0, 0, 1, 1, 1)

		#define MPP9_UNUSED MPP(9, 0x0, 0, 0, 1, 1, 1)
		#define MPP9_GPIO MPP(9, 0x0, 0, 0, 1, 1, 1)
		#define MPP9_GIGE MPP(9, 0x1, 1, 1, 1, 1, 1)
		#define MPP9_GPIO MPP(9, 0x0, 1, 1, 1, 1, 1)
		#define MPP9_GIGE MPP(9, 0x1, 0, 0, 1, 1, 1)

		#define MPP10_UNUSED MPP(10, 0x0, 0, 0, 1, 1, 1)
		#define MPP10_GPIO MPP(10, 0x0, 1, 1, 1, 1, 1)