summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRandy Dunlap <rddunlap@osdl.org>2004-03-30 22:53:59 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2004-03-30 22:53:59 -0800
commit7553ed4648625568bb677f82ba10e9c0a64b250f (patch)
tree3b61ac7799bb20cd96325f570b2d71b2ae1c6f42 /include/linux
parent47287358aaa36ce4e3bbf71c167157913b94db1e (diff)
[PATCH] PCI: move DMA_nnBIT_MASK to linux/dma-mapping.h
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dma-mapping.h3
-rw-r--r--include/linux/pci.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 5be0d81ba058..2c0f0b59368d 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -10,6 +10,9 @@ enum dma_data_direction {
DMA_NONE = 3,
};
+#define DMA_64BIT_MASK 0xffffffffffffffffULL
+#define DMA_32BIT_MASK 0x00000000ffffffffULL
+
#include <asm/dma-mapping.h>
/* Backwards compat, remove in 2.7.x */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index d8e5700c77c6..275344f9c5dc 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -433,9 +433,6 @@ enum pci_mmap_state {
#define PCI_DMA_FROMDEVICE 2
#define PCI_DMA_NONE 3
-#define DMA_64BIT_MASK 0xffffffffffffffffULL
-#define DMA_32BIT_MASK 0x00000000ffffffffULL
-
#define DEVICE_COUNT_COMPATIBLE 4
#define DEVICE_COUNT_RESOURCE 12