29c29
< __FBSDID("$FreeBSD: head/sys/dev/fb/creator.c 167308 2007-03-07 21:13:51Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/fb/creator.c 170840 2007-06-16 21:48:50Z marius $");
54c54
< #include <dev/fb/gallant12x22.h>
---
> #include <dev/fb/gfb.h>
76c76
< u_char *sc_font;
---
> const u_char *sc_font;
155a156,157
> extern const struct gfb_font gallant12x22;
>
489,490c491,492
< vi->vi_cwidth = 12;
< vi->vi_cheight = 22;
---
> vi->vi_cwidth = gallant12x22.width;
> vi->vi_cheight = gallant12x22.height;
494c496
< sc->sc_font = gallant12x22_data;
---
> sc->sc_font = gallant12x22.data;
818c820
< uint16_t *p;
---
> const uint16_t *p;
826c828
< p = (uint16_t *)sc->sc_font + (c * adp->va_info.vi_cheight);
---
> p = (const uint16_t *)sc->sc_font + (c * adp->va_info.vi_cheight);