diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-06 23:09:14 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-06 23:09:14 +0000 |
| commit | e067096c8d57d191f29d734cd5692695c95cc36e (patch) | |
| tree | e1c200404c3ed3730d04837113d59ca898eb483a /arch/arm/mach-tegra/board-harmony-pinmux.c | |
| parent | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (diff) | |
| parent | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (diff) | |
| download | op-kernel-dev-e067096c8d57d191f29d734cd5692695c95cc36e.zip op-kernel-dev-e067096c8d57d191f29d734cd5692695c95cc36e.tar.gz | |
Merge branch 'tegra/soc' into next/boards
Conflicts:
arch/arm/mach-tegra/board-harmony-pcie.c
To fix an internal merge conflict between the tegra/soc and tegra/boards
branches.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony-pinmux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c index 5038f5b..465808c 100644 --- a/arch/arm/mach-tegra/board-harmony-pinmux.c +++ b/arch/arm/mach-tegra/board-harmony-pinmux.c @@ -19,6 +19,7 @@ #include <linux/of.h> #include <mach/pinmux.h> +#include <mach/pinmux-tegra20.h> #include "gpio-names.h" #include "board-harmony.h" |
