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

[pandora-kernel.git] / drivers / mmc / host / mmc_spi.c

diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index dfc290d..62a3582 100644 (file)
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1496,12 +1496,21 @@ static int __devexit mmc_spi_remove(struct spi_device *spi)
        return 0;
 }
 
        return 0;
 }
 

+#if defined(CONFIG_OF)
+static struct of_device_id mmc_spi_of_match_table[] __devinitdata = {
+       { .compatible = "mmc-spi-slot", },
+       {},
+};
+#endif

 
 static struct spi_driver mmc_spi_driver = {
        .driver = {
                .name =         "mmc_spi",
                .bus =          &spi_bus_type,
                .owner =        THIS_MODULE,
 
 static struct spi_driver mmc_spi_driver = {
        .driver = {
                .name =         "mmc_spi",
                .bus =          &spi_bus_type,
                .owner =        THIS_MODULE,

+#if defined(CONFIG_OF)
+               .of_match_table = mmc_spi_of_match_table,
+#endif

        },
        .probe =        mmc_spi_probe,
        .remove =       __devexit_p(mmc_spi_remove),
        },
        .probe =        mmc_spi_probe,
        .remove =       __devexit_p(mmc_spi_remove),