diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 06:48:50 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-06 06:48:50 -0400 |
| commit | 3086c9f6482101b3c06935cdfb4d4b56adb60097 (patch) | |
| tree | 30b40b82f5f6d26982886a2aea5585cfdb4ac9ef /drivers/spi/spi-davinci.c | |
| parent | c1be5a5b1b355d40e6cf79cc979eb66dafa24ad1 (diff) | |
| parent | 0d2d0cc5216db678070efc911ef47f4cb53b4aad (diff) | |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux into spi-fix-grant
Diffstat (limited to 'drivers/spi/spi-davinci.c')
| -rw-r--r-- | drivers/spi/spi-davinci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 8234d2259722..6287c8315d0d 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c | |||
| @@ -784,7 +784,7 @@ static const struct of_device_id davinci_spi_of_match[] = { | |||
| 784 | }, | 784 | }, |
| 785 | { }, | 785 | { }, |
| 786 | }; | 786 | }; |
| 787 | MODULE_DEVICE_TABLE(of, davini_spi_of_match); | 787 | MODULE_DEVICE_TABLE(of, davinci_spi_of_match); |
| 788 | 788 | ||
| 789 | /** | 789 | /** |
| 790 | * spi_davinci_get_pdata - Get platform data from DTS binding | 790 | * spi_davinci_get_pdata - Get platform data from DTS binding |