git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
video
/
console
/
fonts.c
diff --git
a/drivers/video/console/fonts.c
b/drivers/video/console/fonts.c
index
465d678
..
c960728
100644
(file)
--- a/
drivers/video/console/fonts.c
+++ b/
drivers/video/console/fonts.c
@@
-12,7
+12,6
@@
* for more details.
*/
* for more details.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
@@
-23,7
+22,7
@@
#define NO_FONTS
#define NO_FONTS
-static struct font_desc *fonts[] = {
+static
const
struct font_desc *fonts[] = {
#ifdef CONFIG_FONT_8x8
#undef NO_FONTS
&font_vga_8x8,
#ifdef CONFIG_FONT_8x8
#undef NO_FONTS
&font_vga_8x8,
@@
-36,6
+35,10
@@
static struct font_desc *fonts[] = {
#undef NO_FONTS
&font_vga_6x11,
#endif
#undef NO_FONTS
&font_vga_6x11,
#endif
+#ifdef CONFIG_FONT_7x14
+#undef NO_FONTS
+ &font_7x14,
+#endif
#ifdef CONFIG_FONT_SUN8x16
#undef NO_FONTS
&font_sun_8x16,
#ifdef CONFIG_FONT_SUN8x16
#undef NO_FONTS
&font_sun_8x16,
@@
-44,6
+47,10
@@
static struct font_desc *fonts[] = {
#undef NO_FONTS
&font_sun_12x22,
#endif
#undef NO_FONTS
&font_sun_12x22,
#endif
+#ifdef CONFIG_FONT_10x18
+#undef NO_FONTS
+ &font_10x18,
+#endif
#ifdef CONFIG_FONT_ACORN_8x8
#undef NO_FONTS
&font_acorn_8x8,
#ifdef CONFIG_FONT_ACORN_8x8
#undef NO_FONTS
&font_acorn_8x8,
@@
-58,7
+65,7
@@
static struct font_desc *fonts[] = {
#endif
};
#endif
};
-#define num_fonts
(sizeof(fonts)/sizeof(*fonts)
)
+#define num_fonts
ARRAY_SIZE(fonts
)
#ifdef NO_FONTS
#error No fonts configured.
#ifdef NO_FONTS
#error No fonts configured.
@@
-76,7
+83,7
@@
static struct font_desc *fonts[] = {
*
*/
*
*/
-
struct font_desc *find_font(
char *name)
+
const struct font_desc *find_font(const
char *name)
{
unsigned int i;
{
unsigned int i;
@@
-100,10
+107,10
@@
struct font_desc *find_font(char *name)
*
*/
*
*/
-struct font_desc *get_default_font(int xres, int yres)
+
const
struct font_desc *get_default_font(int xres, int yres)
{
int i, c, cc;
{
int i, c, cc;
- struct font_desc *f, *g;
+
const
struct font_desc *f, *g;
g = NULL;
cc = -10000;
g = NULL;
cc = -10000;
@@
-130,7
+137,6
@@
struct font_desc *get_default_font(int xres, int yres)
return g;
}
return g;
}
-EXPORT_SYMBOL(fonts);
EXPORT_SYMBOL(find_font);
EXPORT_SYMBOL(get_default_font);
EXPORT_SYMBOL(find_font);
EXPORT_SYMBOL(get_default_font);