Commit 7f0eb5bd authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] struct font_desc external use

Move the definition of struct font_desc back to <video/font.h>, so it can be
used outside of drivers/video/console (needed for Mac/m68k boot progress
messages).
parent 3bcf19ec
...@@ -8,18 +8,10 @@ ...@@ -8,18 +8,10 @@
* for more details. * for more details.
*/ */
#ifndef _VIDEO_FONT_H #ifndef _VIDEO_CONSOLE_FONT_H
#define _VIDEO_FONT_H #define _VIDEO_CONSOLE_FONT_H
#include <linux/types.h> #include <video/font.h> /* struct font_desc */
struct font_desc {
int idx;
char *name;
int width, height;
void *data;
int pref;
};
#define VGA8x8_IDX 0 #define VGA8x8_IDX 0
#define VGA8x16_IDX 1 #define VGA8x16_IDX 1
...@@ -50,4 +42,4 @@ extern struct font_desc *get_default_font(int xres, int yres); ...@@ -50,4 +42,4 @@ extern struct font_desc *get_default_font(int xres, int yres);
/* Max. length for the name of a predefined font */ /* Max. length for the name of a predefined font */
#define MAX_FONT_NAME 32 #define MAX_FONT_NAME 32
#endif /* _VIDEO_FONT_H */ #endif /* _VIDEO_CONSOLE_FONT_H */
/*
* font.h -- `Soft' font definitions
*
* Created 1995 by Geert Uytterhoeven
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of this archive
* for more details.
*/
#ifndef _VIDEO_FONT_H
#define _VIDEO_FONT_H
#include <linux/types.h>
struct font_desc {
int idx;
char *name;
int width, height;
void *data;
int pref;
};
#endif /* _VIDEO_FONT_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment