diff options
| author | Grant Likely | 2011-02-22 22:56:50 +0100 |
|---|---|---|
| committer | Grant Likely | 2011-02-22 22:57:00 +0100 |
| commit | 9bde36afcaf0ec2ad9f03974da41875c759a4fe8 (patch) | |
| tree | 5b6f2fd6c86d5dadaf427c302ed35f738c2be55b /drivers/mmc/host | |
| parent | spi/imx: select master mode for all channels (diff) | |
| parent | driver-core: remove conditionals around devicetree pointers (diff) | |
| download | kernel-qcow2-linux-9bde36afcaf0ec2ad9f03974da41875c759a4fe8.tar.gz kernel-qcow2-linux-9bde36afcaf0ec2ad9f03974da41875c759a4fe8.tar.xz kernel-qcow2-linux-9bde36afcaf0ec2ad9f03974da41875c759a4fe8.zip | |
Merge branch 'devicetree/next' into spi/next
To pick up removal of #ifdef around .of_match_table
Diffstat (limited to 'drivers/mmc/host')
| -rw-r--r-- | drivers/mmc/host/mmc_spi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index fd877f633dd2..2f7fc0c5146f 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -1516,21 +1516,17 @@ static int __devexit mmc_spi_remove(struct spi_device *spi) 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, -#if defined(CONFIG_OF) .of_match_table = mmc_spi_of_match_table, -#endif }, .probe = mmc_spi_probe, .remove = __devexit_p(mmc_spi_remove), |