diff --git a/[refs] b/[refs]
index 992aaa630bf1..b6ce71f346ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b96cc7fe190b9356633c70afae61ee0637b000ee
+refs/heads/master: d5fdafd38ca0c28c4648909ce0afd0a5420309ca
diff --git a/trunk/arch/arm/mach-tegra/board-trimslice.c b/trunk/arch/arm/mach-tegra/board-trimslice.c
index 0f3081a97126..7be7d4acd02f 100644
--- a/trunk/arch/arm/mach-tegra/board-trimslice.c
+++ b/trunk/arch/arm/mach-tegra/board-trimslice.c
@@ -79,6 +79,9 @@ static __initdata struct tegra_clk_init_table trimslice_clk_init_table[] = {
 
 static int __init tegra_trimslice_pci_init(void)
 {
+	if (!machine_is_trimslice())
+		return 0;
+
 	return tegra_pcie_init(true, true);
 }
 subsys_initcall(tegra_trimslice_pci_init);