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
/
tgafb.c
diff --git
a/drivers/video/tgafb.c
b/drivers/video/tgafb.c
index
075c66d
..
7398bd4
100644
(file)
--- a/
drivers/video/tgafb.c
+++ b/
drivers/video/tgafb.c
@@
-45,9
+45,7
@@
static void tgafb_fillrect(struct fb_info *, const struct fb_fillrect *);
static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);
static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);
static void tgafb_copyarea(struct fb_info *, const struct fb_copyarea *);
static int tgafb_pci_register(struct pci_dev *, const struct pci_device_id *);
-#ifdef MODULE
static void tgafb_pci_unregister(struct pci_dev *);
static void tgafb_pci_unregister(struct pci_dev *);
-#endif
static const char *mode_option = "640x480@60";
static const char *mode_option = "640x480@60";
@@
-65,7
+63,6
@@
static struct fb_ops tgafb_ops = {
.fb_fillrect = tgafb_fillrect,
.fb_copyarea = tgafb_copyarea,
.fb_imageblit = tgafb_imageblit,
.fb_fillrect = tgafb_fillrect,
.fb_copyarea = tgafb_copyarea,
.fb_imageblit = tgafb_imageblit,
- .fb_cursor = soft_cursor,
};
};
@@
-1484,7
+1481,6
@@
tgafb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent)
return ret;
}
return ret;
}
-#ifdef MODULE
static void __exit
tgafb_pci_unregister(struct pci_dev *pdev)
{
static void __exit
tgafb_pci_unregister(struct pci_dev *pdev)
{
@@
-1500,6
+1496,7
@@
tgafb_pci_unregister(struct pci_dev *pdev)
kfree(info);
}
kfree(info);
}
+#ifdef MODULE
static void __exit
tgafb_exit(void)
{
static void __exit
tgafb_exit(void)
{
@@
-1540,7
+1537,7
@@
tgafb_init(void)
return -ENODEV;
tgafb_setup(option);
#endif
return -ENODEV;
tgafb_setup(option);
#endif
- return pci_
module_init
(&tgafb_driver);
+ return pci_
register_driver
(&tgafb_driver);
}
/*
}
/*