aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFreddy Spierenburg <freddy@dusktilldawn.nl>2006-02-24 13:04:17 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-24 14:31:38 -0800
commitcacfc8cf4ed6e05a0d9a8bd17ab85536abd0f6c5 (patch)
tree51969d297683c72da0bc9af5317fd15ba89d8e9b
parent80c410dc14f7783411b4becf083069d69daaa4a7 (diff)
downloadkernel_samsung_smdk4412-cacfc8cf4ed6e05a0d9a8bd17ab85536abd0f6c5.zip
kernel_samsung_smdk4412-cacfc8cf4ed6e05a0d9a8bd17ab85536abd0f6c5.tar.gz
kernel_samsung_smdk4412-cacfc8cf4ed6e05a0d9a8bd17ab85536abd0f6c5.tar.bz2
[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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 2406899..3d04b2d 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -49,6 +49,7 @@
#include <linux/interrupt.h>
#include <linux/ctype.h>
#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
#include <asm/mach-au1x00/au1000.h>
@@ -406,7 +407,7 @@ int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
vma->vm_flags |= VM_IO;
- if (io_remap_page_range(vma, vma->vm_start, off,
+ if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
vma->vm_end - vma->vm_start,
vma->vm_page_prot)) {
return -EAGAIN;