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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
video
/
pmag-aa-fb.c
diff --git
a/drivers/video/pmag-aa-fb.c
b/drivers/video/pmag-aa-fb.c
index
3e00ad7
..
68ca3cc
100644
(file)
--- a/
drivers/video/pmag-aa-fb.c
+++ b/
drivers/video/pmag-aa-fb.c
@@
-29,7
+29,6
@@
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/mm.h>
-#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/init.h>
@@
-299,8
+298,7
@@
static int aafb_set_cmap(struct fb_cmap *cmap, int kspc, int con,
return -EINVAL;
}
return -EINVAL;
}
-static int aafb_ioctl(struct inode *inode, struct file *file, u32 cmd,
- unsigned long arg, int con, struct fb_info *info)
+static int aafb_ioctl(struct fb_info *info, u32 cmd, unsigned long arg)
{
/* TODO: Not yet implemented */
return -ENOIOCTLCMD;
{
/* TODO: Not yet implemented */
return -ENOIOCTLCMD;
@@
-413,7
+411,7
@@
static struct fb_ops aafb_ops = {
static int __init init_one(int slot)
{
static int __init init_one(int slot)
{
- unsigned long base_addr =
get_tc_base_addr(slot
);
+ unsigned long base_addr =
CKSEG1ADDR(get_tc_base_addr(slot)
);
struct aafb_info *ip = &my_fb_info[slot];
memset(ip, 0, sizeof(struct aafb_info));
struct aafb_info *ip = &my_fb_info[slot];
memset(ip, 0, sizeof(struct aafb_info));