diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:17 -0400 |
commit | 961722f57c5e130a500eb1b44b4b97cc91bd7eeb (patch) | |
tree | f5cef8da1631abdbf0121f8f4c0e80cff6f29198 /drivers/spi | |
parent | 989e6946478e722f44744990d03c6917600b8e82 (diff) | |
parent | 2f1603c6fa72ab7b607b8b44a98e459177bc1651 (diff) |
Merge remote-tracking branch 'spi/topic/topcliff' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index dd55707a6aa5..eaeeed51bbbf 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c | |||
@@ -1797,3 +1797,5 @@ MODULE_PARM_DESC(use_dma, | |||
1797 | 1797 | ||
1798 | MODULE_LICENSE("GPL"); | 1798 | MODULE_LICENSE("GPL"); |
1799 | MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semiconductor ML7xxx IOH SPI Driver"); | 1799 | MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semiconductor ML7xxx IOH SPI Driver"); |
1800 | MODULE_DEVICE_TABLE(pci, pch_spi_pcidev_id); | ||
1801 | |||