diff --git a/[refs] b/[refs] index 23d6f4467601..0a750ae8f5ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0292be4a382957016e8b574dc292779cfb49e029 +refs/heads/master: 663b0e15877293451bdfea619db45eafae9dec54 diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c index b21f84239022..479b2e79ad68 100644 --- a/trunk/drivers/video/tridentfb.c +++ b/trunk/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