From edf0926e1f88336a3469329f3f82c1d0bf29ef15 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 19 Dec 2011 11:01:57 -0700
Subject: [PATCH] --- yaml --- r: 281663 b: refs/heads/master c:
 ba4ba3b02de3b4397e3eaf7926f82ff7229bcfca h: refs/heads/master i:   281661:
 63aab50accecd35519b3e6090775beaa307c0907   281659:
 97d576a6b40ccadf7cb4afb7a0e03be85484cdf1   281655:
 8c035fddd3dde786053176c6a893edc8a0bcfcfc   281647:
 6b14fbae87b517a602a4e2067db4c26f2a04b7fb   281631:
 89cf08e406740bd8d11c8e5c802fe06a5d0396ce   281599:
 76c2e7f48708891db2f81abd0b3e8e7ccd2b4169 v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d850b2115a01..92ad4d2b5f1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 256a32eacf74681631ee7d17c5863f023e3ba402
+refs/heads/master: ba4ba3b02de3b4397e3eaf7926f82ff7229bcfca
diff --git a/trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c b/trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c
index 0fe533573567..734add1280b7 100644
--- a/trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c
+++ b/trunk/arch/arm/mach-tegra/pinmux-tegra20-tables.c
@@ -232,7 +232,7 @@ static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP]
 	PINGROUP(XM2D,  DDR,   RSVD,      RSVD,      RSVD,      RSVD,          RSVD,      -1,   -1, -1,   -1, 0xA8, 28),
 };
 
-void __init tegra20_pinmux_init(const struct tegra_pingroup_desc **pg,
+void __devinit tegra20_pinmux_init(const struct tegra_pingroup_desc **pg,
 		int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,
 		int *pgdrive_max)
 {