Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4a68d54c983514f123e99fc720951a4ee4d84270

Authored by Linus Torvalds
2 parents 15a463532e c88db23325
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 

SPI bug fixes for v3.3-rc2

Minor SPI device driver changes.  A rename of the pch_spi_pcidev symbol
that merely eliminates a modpost warning, and a Kconfig change to allow
the Samsung spi driver to build on EXYNOS.

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver
  spi: Add spi-s3c64xx driver dependency on ARCH_EXYNOS4

Showing 2 changed files Side-by-side Diff

... ... @@ -299,7 +299,7 @@
299 299  
300 300 config SPI_S3C64XX
301 301 tristate "Samsung S3C64XX series type SPI"
302   - depends on (ARCH_S3C64XX || ARCH_S5P64X0)
  302 + depends on (ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS)
303 303 select S3C64XX_DMA if ARCH_S3C64XX
304 304 help
305 305 SPI driver for Samsung S3C64XX and newer SoCs.
drivers/spi/spi-topcliff-pch.c
Diff comments   View file @ 4a68d54
... ... @@ -1720,7 +1720,7 @@
1720 1720  
1721 1721 #endif
1722 1722  
1723   -static struct pci_driver pch_spi_pcidev = {
  1723 +static struct pci_driver pch_spi_pcidev_driver = {
1724 1724 .name = "pch_spi",
1725 1725 .id_table = pch_spi_pcidev_id,
1726 1726 .probe = pch_spi_probe,
... ... @@ -1736,7 +1736,7 @@
1736 1736 if (ret)
1737 1737 return ret;
1738 1738  
1739   - ret = pci_register_driver(&pch_spi_pcidev);
  1739 + ret = pci_register_driver(&pch_spi_pcidev_driver);
1740 1740 if (ret)
1741 1741 return ret;
1742 1742  
... ... @@ -1746,7 +1746,7 @@
1746 1746  
1747 1747 static void __exit pch_spi_exit(void)
1748 1748 {
1749   - pci_unregister_driver(&pch_spi_pcidev);
  1749 + pci_unregister_driver(&pch_spi_pcidev_driver);
1750 1750 platform_driver_unregister(&pch_spi_pd_driver);
1751 1751 }
1752 1752 module_exit(pch_spi_exit);