---

yaml --- r: 303307 b: refs/heads/master c: b7449d9 h: refs/heads/master i: 303305: 1b0503f 303303: 3c1a2c2 v: v3
git-mirror · Apr 18, 2012 · bcdff34 · bcdff34
1 parent d1160c2
commit bcdff34
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 2,417 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f30d12b3ffb321c9d29bd1588940704d9bed2643
+refs/heads/master: b7449d95b0cbfb06b9ca9de8c322c470fbc2a873
diff --git a/trunk/arch/arm/mach-tegra/Makefile b/trunk/arch/arm/mach-tegra/Makefile
@@ -5,7 +5,6 @@ obj-y                                   += io.o
 obj-y                                   += irq.o
 obj-y                                   += clock.o
 obj-y                                   += timer.o
-obj-y                                   += pinmux.o
 obj-y					+= fuse.o
 obj-y					+= pmc.o
 obj-y					+= flowctrl.o
@@ -14,8 +13,6 @@ obj-$(CONFIG_CPU_IDLE)			+= sleep.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= powergate.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-tegra20-tables.o
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= pinmux-tegra30-tables.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= tegra30_clocks.o
 obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o

diff --git a/trunk/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h b/trunk/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h