diff options
author | Freddy Spierenburg <freddy@dusktilldawn.nl> | 2006-02-24 16:04:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-24 17:31:38 -0500 |
commit | cacfc8cf4ed6e05a0d9a8bd17ab85536abd0f6c5 (patch) | |
tree | 51969d297683c72da0bc9af5317fd15ba89d8e9b | |
parent | 80c410dc14f7783411b4becf083069d69daaa4a7 (diff) |
[PATCH] au1100fb: replaced io_remap_page_range() with io_remap_pfn_range()
Replaced the no longer existing io_remap_page_range() routine with the
io_remap_pfn_range() routine. Did not have a chance yet to test the
functionality of the driver, but at least the kernel compiles cleanly again.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/video/au1100fb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c index 2406899f1207..3d04b2def0f1 100644 --- a/drivers/video/au1100fb.c +++ b/drivers/video/au1100fb.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <linux/interrupt.h> | 49 | #include <linux/interrupt.h> |
50 | #include <linux/ctype.h> | 50 | #include <linux/ctype.h> |
51 | #include <linux/dma-mapping.h> | 51 | #include <linux/dma-mapping.h> |
52 | #include <linux/platform_device.h> | ||
52 | 53 | ||
53 | #include <asm/mach-au1x00/au1000.h> | 54 | #include <asm/mach-au1x00/au1000.h> |
54 | 55 | ||
@@ -406,7 +407,7 @@ int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma) | |||
406 | 407 | ||
407 | vma->vm_flags |= VM_IO; | 408 | vma->vm_flags |= VM_IO; |
408 | 409 | ||
409 | if (io_remap_page_range(vma, vma->vm_start, off, | 410 | if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT, |
410 | vma->vm_end - vma->vm_start, | 411 | vma->vm_end - vma->vm_start, |
411 | vma->vm_page_prot)) { | 412 | vma->vm_page_prot)) { |
412 | return -EAGAIN; | 413 | return -EAGAIN; |