diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/mmc/host/mmc_spi.c | |
| parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
| parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/mmc/host/mmc_spi.c')
| -rw-r--r-- | drivers/mmc/host/mmc_spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 7b0f3ef50f96..1145ea0792e6 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c | |||
| @@ -1536,6 +1536,7 @@ static int __devexit mmc_spi_remove(struct spi_device *spi) | |||
| 1536 | #if defined(CONFIG_OF) | 1536 | #if defined(CONFIG_OF) |
| 1537 | static struct of_device_id mmc_spi_of_match_table[] __devinitdata = { | 1537 | static struct of_device_id mmc_spi_of_match_table[] __devinitdata = { |
| 1538 | { .compatible = "mmc-spi-slot", }, | 1538 | { .compatible = "mmc-spi-slot", }, |
| 1539 | {}, | ||
| 1539 | }; | 1540 | }; |
| 1540 | #endif | 1541 | #endif |
| 1541 | 1542 | ||