Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / drivers / video / tridentfb.c

diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index b21f842390225b4dd9f52829359b78570a95a2b9..479b2e79ad68ea569882bf7ce7df7645d648a02d 100644 (file)
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -1359,10 +1359,6 @@ static int __devinit trident_pci_probe(struct pci_dev *dev,
 
        chip_id = id->device;
 
-       if (chip_id == CYBERBLADEi1)
-               output("*** Please do use cyblafb, Cyberblade/i1 support "
-                      "will soon be removed from tridentfb!\n");
-
 #ifndef CONFIG_FB_TRIDENT_ACCEL
        noaccel = 1;
 #endif