summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-05-25 23:24:02 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-06-02 13:38:33 -0600
commitb53550781b7d51036aea3b3ee63ece3c6c8f4597 (patch)
tree8e2ef00185bf4c2ceb409968dcf2b4d8f113ae58 /drivers/spi
parentffabc9a6e8b34151a97fc91fcbef827f07504f75 (diff)
downloadlinux-3.10-b53550781b7d51036aea3b3ee63ece3c6c8f4597.tar.gz
linux-3.10-b53550781b7d51036aea3b3ee63ece3c6c8f4597.tar.bz2
linux-3.10-b53550781b7d51036aea3b3ee63ece3c6c8f4597.zip
of/spi: Fix build failure on spi_ppc4xx.c
This patch fixes a build error caused by the OF device_node pointer being moved into struct device. Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely <grant.likely@secretlab.ca> CC: Sean MacLennan <smaclennan@pikatech.com> CC: spi-devel-general@lists.sourceforge.net CC: devicetree-discuss@lists.ozlabs.org
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_ppc4xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c
index 19c0b3b34fc..d53466a249d 100644
--- a/drivers/spi/spi_ppc4xx.c
+++ b/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;