From 9f15e894dcca76612e9cc8b7457deb37e5c26a1c Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Tue, 5 Jul 2011 14:15:18 -0600
Subject: [PATCH] --- yaml --- r: 256720 b: refs/heads/master c:
 f7f678a06326ebafe9005203c0b2fa06885fd12c h: refs/heads/master v: v3

---
 [refs]                                                       | 2 +-
 trunk/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt | 2 +-
 trunk/drivers/gpio/gpio-tegra.c                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f4a5b6002c50..22aac6a9dad7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b0919140b49e0871584362ae0cf1d18c476058
+refs/heads/master: f7f678a06326ebafe9005203c0b2fa06885fd12c
diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
index afb3ff3134c8..64aac39e6edc 100644
--- a/trunk/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
+++ b/trunk/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
@@ -1,7 +1,7 @@
 NVIDIA Tegra 2 GPIO controller
 
 Required properties:
-- compatible : "nvidia,tegra250-gpio"
+- compatible : "nvidia,tegra20-gpio"
 - #gpio-cells : Should be two. The first cell is the pin number and the
   second cell is used to specify optional parameters (currently unused).
 - gpio-controller : Marks the device node as a GPIO controller.
diff --git a/trunk/drivers/gpio/gpio-tegra.c b/trunk/drivers/gpio/gpio-tegra.c
index 13afb881ffc3..747eb40e8afe 100644
--- a/trunk/drivers/gpio/gpio-tegra.c
+++ b/trunk/drivers/gpio/gpio-tegra.c
@@ -347,7 +347,7 @@ static int __init tegra_gpio_init(void)
 	 * driver is converted into a platform_device
 	 */
 	tegra_gpio_chip.of_node = of_find_compatible_node(NULL, NULL,
-						"nvidia,tegra250-gpio");
+						"nvidia,tegra20-gpio");
 #endif /* CONFIG_OF_GPIO */
 
 	gpiochip_add(&tegra_gpio_chip);