From 7a53b6f5849325e7c295a5418aa46c86b8ed55e9 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 25 May 2010 23:24:02 -0600
Subject: [PATCH] --- yaml --- r: 199644 b: refs/heads/master c:
 b53550781b7d51036aea3b3ee63ece3c6c8f4597 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/spi/spi_ppc4xx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6ff14e7a2381..22d4a2a9fb0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffabc9a6e8b34151a97fc91fcbef827f07504f75
+refs/heads/master: b53550781b7d51036aea3b3ee63ece3c6c8f4597
diff --git a/trunk/drivers/spi/spi_ppc4xx.c b/trunk/drivers/spi/spi_ppc4xx.c
index 19c0b3b34fce..d53466a249d9 100644
--- a/trunk/drivers/spi/spi_ppc4xx.c
+++ b/trunk/drivers/spi/spi_ppc4xx.c
@@ -397,7 +397,7 @@ static int __init spi_ppc4xx_of_probe(struct of_device *op,
 	struct spi_master *master;
 	struct spi_bitbang *bbp;
 	struct resource resource;
-	struct device_node *np = op->node;
+	struct device_node *np = op->dev.of_node;
 	struct device *dev = &op->dev;
 	struct device_node *opbnp;
 	int ret;