summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/board-omap3touchbook.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-28 02:55:47 +0400
committerArnd Bergmann <arnd@arndb.de>2011-12-28 02:55:47 +0400
commite195ffbe4573f79d590e63e2ae32dac2a73d5768 (patch)
tree3dbf31c376324923c2dc90cefe462ed6b01f9070 /arch/arm/mach-omap2/board-omap3touchbook.c
parent0782e5bb57e16428de32f0f933c77324b186193f (diff)
parente5570bbc9c06634cfac94e06ac1432b53d8595e5 (diff)
downloadlinux-e195ffbe4573f79d590e63e2ae32dac2a73d5768.tar.xz
Merge branch 'tegra/soc' into next/soc
* tegra/soc: arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC arm/tegra: Delete tegra_init_clock() arm/tegra: Fix section mismatch errors in tegra30 pinmux arm/tegra: Fix section mismatch errors in tegra20 pinmux arm/tegra: refresh defconfig for tegra30 arm/tegra: add support for tegra30 based board cardhu arm/tegra: implement support for tegra30 arm/tegra: pinmux tables and definitions for tegra30 arm/tegra: add new fields to struct tegra_pingroup_desc arm/tegra: prepare pinmux code for multiple tegra variants arm/tegra: rename tegra20 pinmux files arm/tegra: generalize L2 cache initialization arm/tegra: use PMC reset arm/tegra: rename board-dt.c to board-dt-tegra20.c arm/tegra: prepare early init for multiple tegra variants arm/tegra: don't export clk_measure_input_freq arm/tegra: prepare clock code for multiple tegra variants arm/tegra: cleanup tegra20 support arm/tegra: clk_get should not be fatal Conflicts: arch/arm/mach-tegra/board-dt-tegra20.c
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3touchbook.c')
0 files changed, 0 insertions, 0 deletions