Revert "Fonts: Make font size unsigned in font_desc"
This reverts commit78e008dca2which is commit7cb4150034upstream. It breaks the Android kernel ABI and is not needed for Android devices, so it is safe to revert for now. If it is determined that it is needed in the future, it can be brought back in an abi-preserving way. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I6070f402034c1d22ea70db2d1be160b0d0270b8e
This commit is contained in:
@@ -503,7 +503,7 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
|
||||
if (!fbfont)
|
||||
return NULL;
|
||||
|
||||
pr_info("STI selected %ux%u framebuffer font %s for sticon\n",
|
||||
pr_info("STI selected %dx%d framebuffer font %s for sticon\n",
|
||||
fbfont->width, fbfont->height, fbfont->name);
|
||||
|
||||
bpc = ((fbfont->width+7)/8) * fbfont->height;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
struct font_desc {
|
||||
int idx;
|
||||
const char *name;
|
||||
unsigned int width, height;
|
||||
int width, height;
|
||||
const void *data;
|
||||
int pref;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user