From 5e38110454dd9631eeb2694e77595b84f5e154e0 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Tue, 5 Jul 2011 14:18:02 -0600
Subject: [PATCH] --- yaml --- r: 256763 b: refs/heads/master c:
 22032c7774a9619770a1ca92f4f895d69efff386 h: refs/heads/master i:   256761:
 08728972ae62445b86fb53f83f77815428c5bb95   256759:
 f6d2502b7bc2ecc266ddeefef3b97e5db559a9ce v: v3

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

diff --git a/[refs] b/[refs]
index 17abb31270ee..f509b8d4543d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb6440955fcc5d175397fd0e9a00c6967cb26a74
+refs/heads/master: 22032c7774a9619770a1ca92f4f895d69efff386
diff --git a/trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt b/trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt
index bde450b50fcd..6b9e51896693 100644
--- a/trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt
+++ b/trunk/Documentation/devicetree/bindings/spi/spi_nvidia.txt
@@ -1,5 +1,5 @@
 NVIDIA Tegra 2 SPI device
 
 Required properties:
-- compatible : should be "nvidia,tegra250-spi".
+- compatible : should be "nvidia,tegra20-spi".
 - gpios : should specify GPIOs used for chipselect.
diff --git a/trunk/drivers/spi/spi-tegra.c b/trunk/drivers/spi/spi-tegra.c
index a43ceeb1063a..a5a6302dc8e0 100644
--- a/trunk/drivers/spi/spi-tegra.c
+++ b/trunk/drivers/spi/spi-tegra.c
@@ -598,7 +598,7 @@ MODULE_ALIAS("platform:spi_tegra");
 
 #ifdef CONFIG_OF
 static struct of_device_id spi_tegra_of_match_table[] __devinitdata = {
-	{ .compatible = "nvidia,tegra250-spi", },
+	{ .compatible = "nvidia,tegra20-spi", },
 	{}
 };
 MODULE_DEVICE_TABLE(of, spi_tegra_of_match_table);