diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:04:09 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:04:09 +0000 |
commit | 75f7dd81dc5b3f766253fd2e80b179f7fdf2d939 (patch) | |
tree | 75a1a6ec1c499d410b9b1190c0dcd1a4b3460e27 /arch/arm/mach-tegra/Makefile | |
parent | 8df97495c1d2c87f98574522cbeb8bd0453076cb (diff) | |
parent | 16d936213adf8241645ccb4f4ba26fc5f1d41dc7 (diff) |
Merge branch 'tegra/boards' into next/boards
* tegra/boards:
arm/tegra: remove __initdata annotation from pinmux tables
arm/tegra: Use bus notifiers to trigger pinmux setup
arm/tegra: Refactor board-*-pinmux.c to share code
arm/tegra: Fix mistake in Trimslice's pinmux
arm/tegra: Rework Seaboard-vs-Ventana pinmux table
arm/tegra: Remove useless entries from ventana_pinmux[]
arm/tegra: PCIe: Remove include of mach/pinmux.h
arm/tegra: Harmony PCIe: Don't touch pinmux
arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio
arm/tegra: Split Seaboard GPIO table to allow for Ventana
ARM: tegra: paz00: Fix board pinmux table.
ARM: tegra: paz00: add support for wakeup gpio key
Diffstat (limited to 'arch/arm/mach-tegra/Makefile')
-rw-r--r-- | arch/arm/mach-tegra/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 91a07e18720..e98c49aabd1 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -1,3 +1,4 @@ +obj-y += board-pinmux.o obj-y += common.o obj-y += devices.o obj-y += io.o |