git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
video
/
aty
/
mach64_cursor.c
diff --git
a/drivers/video/aty/mach64_cursor.c
b/drivers/video/aty/mach64_cursor.c
index
46f72ed
..
95ec042
100644
(file)
--- a/
drivers/video/aty/mach64_cursor.c
+++ b/
drivers/video/aty/mach64_cursor.c
@@
-183,7
+183,7
@@
static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
return 0;
}
-int
__devinit
aty_init_cursor(struct fb_info *info)
+int aty_init_cursor(struct fb_info *info)
{
unsigned long addr;