lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2012-02-08 19:05:47 -08:00
parent 15a463532e c88db23325
commit 4a68d54c98
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/Kconfig
View File

@@ -299,7 +299,7 @@ config SPI_S3C24XX_FIQ
config SPI_S3C64XX config SPI_S3C64XX
tristate "Samsung S3C64XX series type SPI" 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 select S3C64XX_DMA if ARCH_S3C64XX
help help
SPI driver for Samsung S3C64XX and newer SoCs. SPI driver for Samsung S3C64XX and newer SoCs.

6
drivers/spi/spi-topcliff-pch.c
View File

@@ -1720,7 +1720,7 @@ static int pch_spi_resume(struct pci_dev *pdev)
#endif #endif
static struct pci_driver pch_spi_pcidev = { static struct pci_driver pch_spi_pcidev_driver = {
.name = "pch_spi", .name = "pch_spi",
.id_table = pch_spi_pcidev_id, .id_table = pch_spi_pcidev_id,
.probe = pch_spi_probe, .probe = pch_spi_probe,
@@ -1736,7 +1736,7 @@ static int __init pch_spi_init(void)
if (ret) if (ret)
return ret; return ret;
ret = pci_register_driver(&pch_spi_pcidev); ret = pci_register_driver(&pch_spi_pcidev_driver);
if (ret) if (ret)
return ret; return ret;
@@ -1746,7 +1746,7 @@ module_init(pch_spi_init);
static void __exit pch_spi_exit(void) 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); platform_driver_unregister(&pch_spi_pd_driver);
} }
module_exit(pch_spi_exit); module_exit(pch_spi_exit);