diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-06 18:09:14 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-06 18:09:14 -0500 |
| commit | e067096c8d57d191f29d734cd5692695c95cc36e (patch) | |
| tree | e1c200404c3ed3730d04837113d59ca898eb483a /arch/arm/mach-tegra/board-seaboard-pinmux.c | |
| parent | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (diff) | |
| parent | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (diff) | |
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-seaboard-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-seaboard-pinmux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c b/arch/arm/mach-tegra/board-seaboard-pinmux.c index a448f29fbbb2..55e7e43a14ad 100644 --- a/arch/arm/mach-tegra/board-seaboard-pinmux.c +++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
| 20 | 20 | ||
| 21 | #include <mach/pinmux.h> | 21 | #include <mach/pinmux.h> |
| 22 | #include <mach/pinmux-t2.h> | 22 | #include <mach/pinmux-tegra20.h> |
| 23 | 23 | ||
| 24 | #include "gpio-names.h" | 24 | #include "gpio-names.h" |
| 25 | #include "board-pinmux.h" | 25 | #include "board-pinmux.h" |