This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / oss / rme96xx.c

diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index 96cc75a..c770137 100644 (file)
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -273,7 +273,7 @@ typedef struct _rme96xx_info {
        /* hardware settings */
        int magic;
        struct pci_dev * pcidev; /* pci_dev structure */
-       unsigned long __iomem *iobase;  
+       unsigned long *iobase;  
        unsigned int irq;
 
        /* list of rme96xx devices */
@@ -1685,14 +1685,14 @@ static int rm96xx_mmap(struct file *file, struct vm_area_struct *vma) {
        if (vma->vm_flags & VM_WRITE) {
                if (!s->started) rme96xx_startcard(s,1);
 
-               if (remap_pfn_range(vma, vma->vm_start, virt_to_phys(s->playbuf + dma->outoffset*RME96xx_DMA_MAX_SIZE) >> PAGE_SHIFT, size, vma->vm_page_prot)) {
+               if (remap_page_range(vma, vma->vm_start, virt_to_phys(s->playbuf + dma->outoffset*RME96xx_DMA_MAX_SIZE), size, vma->vm_page_prot)) {
                        unlock_kernel();
                        return -EAGAIN;
                }
        } 
        else if (vma->vm_flags & VM_READ) {
                if (!s->started) rme96xx_startcard(s,1);
-               if (remap_pfn_range(vma, vma->vm_start, virt_to_phys(s->playbuf + dma->inoffset*RME96xx_DMA_MAX_SIZE) >> PAGE_SHIFT, size, vma->vm_page_prot)) {
+               if (remap_page_range(vma, vma->vm_start, virt_to_phys(s->playbuf + dma->inoffset*RME96xx_DMA_MAX_SIZE), size, vma->vm_page_prot)) {
                        unlock_kernel();
                        return -EAGAIN;
                }