diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 07:17:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 07:17:31 -0700 |
| commit | a652883a244901742d6c9733a9eebdf72e3114ea (patch) | |
| tree | 5540eec3287bd9515661d502aaec3a696fefd906 /drivers/spi/spi_ppc4xx.c | |
| parent | a57ee627499d116f6872a5634ea4f015da0eacd2 (diff) | |
| parent | ee227c577cde47f78e2df359f9c32ba047060767 (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6:
of/powerpc: fix fsl_msi device node pointer
of/watchdog: gef_wdt.c: fix build breakage
of/edac: fix build breakage in drivers
of/net: fs_enet/mii-bitbang.c: fix build breakage
of/usb: fsl_qe_udc.c: fix build breakage
of/crypto: crypto4xx_core.c: fix build breakage
of/dma: fix build breakage in ppc4xx adma driver
of/mtd: nand: fix build breakage in drivers
of/video: fix build breakage in FB drivers
of/pcmcia: m8xx_pcmcia.c: Fix build failures
of/rtc: rtc-mpc5121.c: Fix build failures
of/dma: mpc512x_dma.c: Fix build failures
of/mtd/nand: mpc5121_nfc.c: Fix build failures
of/spi: mpc512x_psc_spi.c: Fix build failures
watchdog: Fix build failure with OF changes
of/spi: Fix build failure on spi_ppc4xx.c
of/usb: fix build error due to of_node pointer move
of/powerpc: fix 85xx RapidIO device node pointer
Diffstat (limited to 'drivers/spi/spi_ppc4xx.c')
| -rw-r--r-- | drivers/spi/spi_ppc4xx.c | 2 |
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; |