Messages in this thread Patch in this message | | | Date | Fri, 20 Apr 2001 11:38:37 +0200 (CEST) | From | Geert Uytterhoeven <> | Subject | Re: Linux 2.4.3-ac10 |
| |
On Thu, 19 Apr 2001, Alan Cox wrote: > 2.4.3-ac10 > o Merge Linus 2.4.4pre4 > o Reorder frame buffer probes (Geert Uytterhoeven)
These got somewhat mixed. Remove the duplicates:
--- linux-2.4.3-ac10/drivers/video/fbmem.c.orig Fri Apr 20 09:58:50 2001 +++ linux-2.4.3-ac10/drivers/video/fbmem.c Fri Apr 20 11:33:28 2001 @@ -205,9 +205,6 @@ #if defined(CONFIG_FB_SIS) && (defined(CONFIG_FB_SIS_300) || defined(CONFIG_FB_SIS_315)) { "sisfb", sisfb_init, sisfb_setup }, #endif -#ifdef CONFIG_FB_E1355 - { "e1355fb", e1355fb_init, e1355fb_setup }, -#endif /* * Generic drivers that are used as fallbacks @@ -275,9 +272,6 @@ #endif #ifdef CONFIG_FB_E1355 { "e1355fb", e1355fb_init, e1355fb_setup }, -#endif -#ifdef CONFIG_FB_DC - { "dcfb", dcfb_init, NULL }, #endif #ifdef CONFIG_FB_DC { "dcfb", dcfb_init, NULL }, Gr{oetje,eeting}s, Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |