2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3f9a47ec67dc..8293658e7cf9 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -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.
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 2a6429d8c363..10182eb50068 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -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,
@@ -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;
 
@@ -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);