git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
pci
/
ad1889.c
diff --git
a/sound/pci/ad1889.c
b/sound/pci/ad1889.c
index
eece1c7
..
a208075
100644
(file)
--- a/
sound/pci/ad1889.c
+++ b/
sound/pci/ad1889.c
@@
-34,7
+34,6
@@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/pci.h>
-#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/compiler.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/compiler.h>
@@
-910,10
+909,10
@@
snd_ad1889_create(struct snd_card *card,
if ((err = pci_enable_device(pci)) < 0)
return err;
if ((err = pci_enable_device(pci)) < 0)
return err;
-
+
/* check PCI availability (32bit DMA) */
/* check PCI availability (32bit DMA) */
- if (pci_set_dma_mask(pci,
DMA_32BIT_MASK
) < 0 ||
- pci_set_consistent_dma_mask(pci,
DMA_32BIT_MASK
) < 0) {
+ if (pci_set_dma_mask(pci,
0xffffffff
) < 0 ||
+ pci_set_consistent_dma_mask(pci,
0xffffffff
) < 0) {
printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");
pci_disable_device(pci);
return -ENXIO;
printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");
pci_disable_device(pci);
return -ENXIO;
@@
-1051,7
+1050,7
@@
snd_ad1889_remove(struct pci_dev *pci)
pci_set_drvdata(pci, NULL);
}
pci_set_drvdata(pci, NULL);
}
-static struct pci_device_id snd_ad1889_ids[]
__devinitdata
= {
+static struct pci_device_id snd_ad1889_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS) },
{ 0, },
};
{ PCI_DEVICE(PCI_VENDOR_ID_ANALOG_DEVICES, PCI_DEVICE_ID_AD1889JS) },
{ 0, },
};