diff options
| author | Tobias Klauser <tklauser@nuerscht.ch> | 2006-04-11 01:54:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 09:18:44 -0400 |
| commit | 56b146d36db933844011d5026c6f55593037c7b8 (patch) | |
| tree | e8b9bed7bf22f658f9b62bf13e512bf08f137efc /sound/oss/emu10k1 | |
| parent | 31cc48bfeef7a021d6e29f3454a4505edcfd6daa (diff) | |
[PATCH] Last DMA_xBIT_MASK cleanups
These are the last conversions of pci_set_dma_mask(),
pci_set_consistent_dma_mask() and pci_dma_supported() to use DMA_xBIT_MASK
constants from linux/dma-mapping.h
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss/emu10k1')
| -rw-r--r-- | sound/oss/emu10k1/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c index 0cd44a6f7ac0..3721c5857b90 100644 --- a/sound/oss/emu10k1/main.c +++ b/sound/oss/emu10k1/main.c | |||
| @@ -94,6 +94,7 @@ | |||
| 94 | #include <linux/init.h> | 94 | #include <linux/init.h> |
| 95 | #include <linux/delay.h> | 95 | #include <linux/delay.h> |
| 96 | #include <linux/proc_fs.h> | 96 | #include <linux/proc_fs.h> |
| 97 | #include <linux/dma-mapping.h> | ||
| 97 | 98 | ||
| 98 | #include "hwaccess.h" | 99 | #include "hwaccess.h" |
| 99 | #include "8010.h" | 100 | #include "8010.h" |
| @@ -119,7 +120,7 @@ | |||
| 119 | 120 | ||
| 120 | 121 | ||
| 121 | /* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */ | 122 | /* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */ |
| 122 | #define EMU10K1_DMA_MASK 0x1fffffff /* DMA buffer mask for pci_alloc_consist */ | 123 | #define EMU10K1_DMA_MASK DMA_29BIT_MASK /* DMA buffer mask for pci_alloc_consist */ |
| 123 | 124 | ||
| 124 | #ifndef PCI_VENDOR_ID_CREATIVE | 125 | #ifndef PCI_VENDOR_ID_CREATIVE |
| 125 | #define PCI_VENDOR_ID_CREATIVE 0x1102 | 126 | #define PCI_VENDOR_ID_CREATIVE 0x1102 |