Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[mirror_ubuntu-bionic-kernel.git] / drivers / spi / pxa2xx_spi.c

diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 95928833855b0e922bf5ee23ea6ff36241e8b2bb..a429b01d0285edba75055df0dd49b6a5184ec68f 100644 (file)
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1557,9 +1557,7 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev)
        drv_data->ssp = ssp;
 
        master->dev.parent = &pdev->dev;
-#ifdef CONFIG_OF
        master->dev.of_node = pdev->dev.of_node;
-#endif
        /* the spi->mode bits understood by this driver: */
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;