diff --git a/[refs] b/[refs] index aef9bc73a781..fe54c2e2b4f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fef459028bd842dde21bf55f83d6399b963f9911 +refs/heads/master: 3a0991029b577125ac5b3eedbe366320c581d8d6 diff --git a/trunk/drivers/video/aty/atyfb_base.c b/trunk/drivers/video/aty/atyfb_base.c index f2ebdd880085..93784ceae898 100644 --- a/trunk/drivers/video/aty/atyfb_base.c +++ b/trunk/drivers/video/aty/atyfb_base.c @@ -2957,8 +2957,6 @@ extern void (*prom_palette) (int); static int __devinit atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info, unsigned long addr) { - extern int con_is_present(void); - struct atyfb_par *par = info->par; struct pcidev_cookie *pcp; char prop[128]; diff --git a/trunk/drivers/video/igafb.c b/trunk/drivers/video/igafb.c index 655ae0fa99ca..51355c8885aa 100644 --- a/trunk/drivers/video/igafb.c +++ b/trunk/drivers/video/igafb.c @@ -370,7 +370,6 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par) int __init igafb_init(void) { - extern int con_is_present(void); struct fb_info *info; struct pci_dev *pdev; struct iga_par *par;