Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / spi / spi.c

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index fdde706..a9e5c79 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -26,6 +26,7 @@
 #include <linux/slab.h>
 #include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/mod_devicetable.h>
 #include <linux/spi/spi.h>

+#include <linux/of_spi.h>

 
 
 /* SPI bustype and spi_master class are registered after board init code
 
 
 /* SPI bustype and spi_master class are registered after board init code


@@ -544,6 +545,9 @@ int spi_register_master(struct spi_master *master)
        /* populate children from any spi device tables */
        scan_boardinfo(master);
        status = 0;
        /* populate children from any spi device tables */
        scan_boardinfo(master);
        status = 0;

+
+       /* Register devices from the device tree */
+       of_register_spi_devices(master);

 done:
        return status;
 }
 done:
        return status;
 }