git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] fbcon/fbdev: Move softcursor out of fbdev to fbcon
[safe/jmp/linux-2.6]
/
drivers
/
video
/
tridentfb.c
diff --git
a/drivers/video/tridentfb.c
b/drivers/video/tridentfb.c
index
698ca92
..
9ac2d31
100644
(file)
--- a/
drivers/video/tridentfb.c
+++ b/
drivers/video/tridentfb.c
@@
-1061,6
+1061,11
@@
static int __devinit trident_pci_probe(struct pci_dev * dev, const struct pci_de
chip_id = id->device;
chip_id = id->device;
+ if(chip_id == CYBERBLADEi1)
+ output("*** Please do use cyblafb, Cyberblade/i1 support "
+ "will soon be removed from tridentfb!\n");
+
+
/* If PCI id is 0x9660 then further detect chip type */
if (chip_id == TGUI9660) {
/* If PCI id is 0x9660 then further detect chip type */
if (chip_id == TGUI9660) {
@@
-1288,7
+1293,6
@@
static struct fb_ops tridentfb_ops = {
.fb_fillrect = tridentfb_fillrect,
.fb_copyarea= tridentfb_copyarea,
.fb_imageblit = cfb_imageblit,
.fb_fillrect = tridentfb_fillrect,
.fb_copyarea= tridentfb_copyarea,
.fb_imageblit = cfb_imageblit,
- .fb_cursor = soft_cursor,
};
module_init(tridentfb_init);
};
module_init(tridentfb_init);