Skip to content

Commit

Permalink
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Feb 9, 2012
2 parents 15a4635 + c88db23 commit 4a68d54
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/spi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ config SPI_S3C24XX_FIQ

config SPI_S3C64XX
tristate "Samsung S3C64XX series type SPI"
depends on (ARCH_S3C64XX || ARCH_S5P64X0)
depends on (ARCH_S3C64XX || ARCH_S5P64X0 || ARCH_EXYNOS)
select S3C64XX_DMA if ARCH_S3C64XX
help
SPI driver for Samsung S3C64XX and newer SoCs.
Expand Down
6 changes: 3 additions & 3 deletions drivers/spi/spi-topcliff-pch.c
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ static int pch_spi_resume(struct pci_dev *pdev)

#endif

static struct pci_driver pch_spi_pcidev = {
static struct pci_driver pch_spi_pcidev_driver = {
.name = "pch_spi",
.id_table = pch_spi_pcidev_id,
.probe = pch_spi_probe,
Expand All @@ -1736,7 +1736,7 @@ static int __init pch_spi_init(void)
if (ret)
return ret;

ret = pci_register_driver(&pch_spi_pcidev);
ret = pci_register_driver(&pch_spi_pcidev_driver);
if (ret)
return ret;

Expand All @@ -1746,7 +1746,7 @@ module_init(pch_spi_init);

static void __exit pch_spi_exit(void)
{
pci_unregister_driver(&pch_spi_pcidev);
pci_unregister_driver(&pch_spi_pcidev_driver);
platform_driver_unregister(&pch_spi_pd_driver);
}
module_exit(pch_spi_exit);
Expand Down

0 comments on commit 4a68d54

Please sign in to comment.