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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
video
/
pvr2fb.c
diff --git
a/drivers/video/pvr2fb.c
b/drivers/video/pvr2fb.c
index
f4b2070
..
ec4bacf
100644
(file)
--- a/
drivers/video/pvr2fb.c
+++ b/
drivers/video/pvr2fb.c
@@
-4,7
+4,7
@@
* Dreamcast.
*
* Copyright (c) 2001 M. R. Brown <mrbrown@0xd6.org>
* Dreamcast.
*
* Copyright (c) 2001 M. R. Brown <mrbrown@0xd6.org>
- * Copyright (c) 2001, 2002, 2003, 2004 Paul Mundt <lethal@linux-sh.org>
+ * Copyright (c) 2001, 2002, 2003, 2004
, 2005
Paul Mundt <lethal@linux-sh.org>
*
* This file is part of the LinuxDC project (linuxdc.sourceforge.net).
*
*
* This file is part of the LinuxDC project (linuxdc.sourceforge.net).
*
@@
-33,7
+33,7
@@
* Then, when it's time to convert back to hardware settings, the only
* constants are the borderstart_* offsets, all other values are derived from
* the fb video mode:
* Then, when it's time to convert back to hardware settings, the only
* constants are the borderstart_* offsets, all other values are derived from
* the fb video mode:
- *
+ *
* // PAL
* borderstart_h = 116;
* borderstart_v = 44;
* // PAL
* borderstart_h = 116;
* borderstart_v = 44;
@@
-230,7
+230,6
@@
static struct fb_ops pvr2fb_ops = {
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
- .fb_cursor = soft_cursor,
};
static struct fb_videomode pvr2_modedb[] __initdata = {
};
static struct fb_videomode pvr2_modedb[] __initdata = {
@@
-939,7
+938,8
@@
static int __devinit pvr2fb_pci_probe(struct pci_dev *pdev,
pvr2_fix.mmio_start = pci_resource_start(pdev, 1);
pvr2_fix.mmio_len = pci_resource_len(pdev, 1);
pvr2_fix.mmio_start = pci_resource_start(pdev, 1);
pvr2_fix.mmio_len = pci_resource_len(pdev, 1);
- fbinfo->device = &pdev->dev;
+
+ fb_info->device = &pdev->dev;
return pvr2fb_common_init();
}
return pvr2fb_common_init();
}
@@
-966,7
+966,7
@@
static struct pci_driver pvr2fb_pci_driver = {
static int __init pvr2fb_pci_init(void)
{
static int __init pvr2fb_pci_init(void)
{
- return pci_
module_init
(&pvr2fb_pci_driver);
+ return pci_
register_driver
(&pvr2fb_pci_driver);
}
static void pvr2fb_pci_exit(void)
}
static void pvr2fb_pci_exit(void)
@@
-1068,7
+1068,6
@@
int __init pvr2fb_init(void)
size = sizeof(struct fb_info) + sizeof(struct pvr2fb_par) + 16 * sizeof(u32);
fb_info = kmalloc(size, GFP_KERNEL);
size = sizeof(struct fb_info) + sizeof(struct pvr2fb_par) + 16 * sizeof(u32);
fb_info = kmalloc(size, GFP_KERNEL);
-
if (!fb_info) {
printk(KERN_ERR "Failed to allocate memory for fb_info\n");
return -ENOMEM;
if (!fb_info) {
printk(KERN_ERR "Failed to allocate memory for fb_info\n");
return -ENOMEM;