From 6116f0948509fcd794cb963a631e4ef33a81ab87 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 28 Jul 2009 14:42:32 -0700 Subject: [PATCH] --- yaml --- r: 165759 b: refs/heads/master c: b31b78f1ab7806759622b703357e39a21f757281 h: refs/heads/master i: 165757: 38a945786e03e5b7424b7bd289e24bc4b36ad756 165755: fdb6557cf2e090e71a0a04d9526e27864b6ea8a7 165751: fba3e111f6314ba3a4511f80992f519081890c5d 165743: 1610a8e7fe4f47e66c0957a26e30c4a350afd51c 165727: 6dde4fd95a01b11bf23377287c482d529bb2cab6 165695: 97c7950f6dff9f79a587ac350dbfd5a51e78ade0 165631: ac58b482f11a5aac31b81e30b2ef4bddd6bafe3d v: v3 --- [refs] | 2 +- trunk/drivers/dma/ioat/dma.h | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 5f0e53b6f0fe..f6136d9afeda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc3c70258526a635325f1f15138a96297879bc1a +refs/heads/master: b31b78f1ab7806759622b703357e39a21f757281 diff --git a/trunk/drivers/dma/ioat/dma.h b/trunk/drivers/dma/ioat/dma.h index c5eabae4c1b9..6e27ddb1e98a 100644 --- a/trunk/drivers/dma/ioat/dma.h +++ b/trunk/drivers/dma/ioat/dma.h @@ -153,19 +153,10 @@ static inline void ioat_set_tcp_copy_break(struct ioatdma_device *dev) #endif } -#if defined(CONFIG_INTEL_IOATDMA) || defined(CONFIG_INTEL_IOATDMA_MODULE) struct ioatdma_device *ioat_dma_probe(struct pci_dev *pdev, void __iomem *iobase); void ioat_dma_remove(struct ioatdma_device *device); struct dca_provider *ioat_dca_init(struct pci_dev *pdev, void __iomem *iobase); struct dca_provider *ioat2_dca_init(struct pci_dev *pdev, void __iomem *iobase); struct dca_provider *ioat3_dca_init(struct pci_dev *pdev, void __iomem *iobase); -#else -#define ioat_dma_probe(pdev, iobase) NULL -#define ioat_dma_remove(device) do { } while (0) -#define ioat_dca_init(pdev, iobase) NULL -#define ioat2_dca_init(pdev, iobase) NULL -#define ioat3_dca_init(pdev, iobase) NULL -#endif - #endif /* IOATDMA_H */