---

yaml
---
r: 272871
b: refs/heads/master
c: e146245
h: refs/heads/master
i:
  272869: 19ce954
  272867: f30038c
  272863: 3daf454
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48f2eceefb9d1b79e4c37795d2121933fcbc34f5
+refs/heads/master: e146245453986974a294d91d691481da8b61696b

trunk/arch/arm/mach-tegra/board-seaboard-pinmux.c

@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2010 NVIDIA Corporation
+ * Copyright (C) 2010,2011 NVIDIA Corporation
+ * Copyright (C) 2011 Google, Inc.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -163,7 +164,7 @@ static struct platform_device *pinmux_devices[] = {
 	&tegra_pinmux_device,
 };
 
-static struct tegra_gpio_table gpio_table[] = {
+static struct tegra_gpio_table common_gpio_table[] = {
 	{ .gpio = TEGRA_GPIO_SD2_CD,		.enable = true },
 	{ .gpio = TEGRA_GPIO_SD2_WP,		.enable = true },
 	{ .gpio = TEGRA_GPIO_SD2_POWER,		.enable = true },
@@ -172,7 +173,7 @@ static struct tegra_gpio_table gpio_table[] = {
 	{ .gpio = TEGRA_GPIO_ISL29018_IRQ,	.enable = true },
 };
 
-void __init seaboard_pinmux_init(void)
+void __init seaboard_common_pinmux_init(void)
 {
 	platform_add_devices(pinmux_devices, ARRAY_SIZE(pinmux_devices));
 
@@ -181,5 +182,10 @@ void __init seaboard_pinmux_init(void)
 	tegra_drive_pinmux_config_table(seaboard_drive_pinmux,
 					ARRAY_SIZE(seaboard_drive_pinmux));
 
-	tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));
+	tegra_gpio_config(common_gpio_table, ARRAY_SIZE(common_gpio_table));
+}
+
+void __init seaboard_pinmux_init(void)
+{
+	seaboard_common_pinmux_init();
 }