From 2c9286de9bfccf7c77bacbc7b74074708cf249b7 Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Mon, 6 Dec 2021 23:30:34 +0100 Subject: [PATCH] Fix DMA detection macro Some arm64 builds have CONFIG_PCI, but free_dma() and request_dma() symbols depend on CONFIG_GENERIC_ISA_DMA --- devices/ccat/module.c | 8 ++++---- devices/ccat/netdev.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devices/ccat/module.c b/devices/ccat/module.c index 126014c9..2c0cdb28 100644 --- a/devices/ccat/module.c +++ b/devices/ccat/module.c @@ -50,7 +50,7 @@ static inline int dma_set_mask_and_coherent(struct device *dev, u64 mask) * configure the drivers capabilities here */ static const struct ccat_driver *const drivers[] = { -#ifdef CONFIG_PCI +#ifdef CONFIG_GENERIC_ISA_DMA ð_dma_driver, /* load Ethernet MAC/EtherCAT Master driver with DMA support from netdev.c */ #endif ð_eim_driver, /* load Ethernet MAC/EtherCAT Master driver without DMA support from */ @@ -257,7 +257,7 @@ static void ccat_functions_remove(struct ccat_device *const dev) } } -#ifdef CONFIG_PCI +#ifdef CONFIG_GENERIC_ISA_DMA static int ccat_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct ccat_device *ccatdev; @@ -362,7 +362,7 @@ static struct pci_driver ccat_pci_driver = { module_pci_driver(ccat_pci_driver); -#else /* #ifdef CONFIG_PCI */ +#else /* #ifdef CONFIG_GENERIC_ISA_DMA */ static int ccat_eim_probe(struct platform_device *pdev) { @@ -424,4 +424,4 @@ static struct platform_driver ccat_eim_driver = { }; module_platform_driver(ccat_eim_driver); -#endif /* #ifdef CONFIG_PCI */ +#endif /* #ifdef CONFIG_GENERIC_ISA_DMA */ diff --git a/devices/ccat/netdev.c b/devices/ccat/netdev.c index b006d8f5..5ff1159e 100644 --- a/devices/ccat/netdev.c +++ b/devices/ccat/netdev.c @@ -24,7 +24,7 @@ #include #include -#ifdef CONFIG_PCI +#ifdef CONFIG_GENERIC_ISA_DMA #include #else #define free_dma(X)