diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-08 23:55:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 00:05:25 -0700 |
| commit | 973076ae0ab384b9689de95cd645d742b03651f8 (patch) | |
| tree | ab82af3579f8825a5b3c24e33ced15d61c3fffca | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| parent | 48d99f47a81a66bdd61a348c7fe8df5a7afdf5f3 (diff) | |
| download | ubi2-973076ae0ab384b9689de95cd645d742b03651f8.tar.gz | |
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
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/mpp.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 1c672d9e6656a0..f7fe1b9f31703c 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -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> diff --git a/arch/arm/mach-orion5x/mpp.h b/arch/arm/mach-orion5x/mpp.h index eac68978a2c2a3..db70e79a11985f 100644 --- a/arch/arm/mach-orion5x/mpp.h +++ b/arch/arm/mach-orion5x/mpp.h @@ -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) |