xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devicetree/next' into spi/next

Browse Source 
To pick up removal of #ifdef around .of_match_table
This commit is contained in:
Grant Likely
2011-02-22 14:56:50 -07:00
parent f020c39e51 c9e358dfc4
commit 9bde36afca
10 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/host/mmc_spi.c
View File

@@ -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),