diff options
| author | Linus Torvalds | 2014-02-03 01:32:53 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2014-02-03 01:32:53 +0100 |
| commit | 69048e01881747e27457cd514a6b85d925982046 (patch) | |
| tree | cb613a8f8b41232937ff8ffc049309ddceb5aedd /drivers | |
| parent | hpfs: optimize quad buffer loading (diff) | |
| parent | parisc: add flexible mmap memory layout support (diff) | |
| download | kernel-qcow2-linux-69048e01881747e27457cd514a6b85d925982046.tar.gz kernel-qcow2-linux-69048e01881747e27457cd514a6b85d925982046.tar.xz kernel-qcow2-linux-69048e01881747e27457cd514a6b85d925982046.zip | |
Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"The three major changes in this patchset is a implementation for
flexible userspace memory maps, cache-flushing fixes (again), and a
long-discussed ABI change to make EWOULDBLOCK the same value as
EAGAIN.
parisc has been the only platform where we had EWOULDBLOCK != EAGAIN
to keep HP-UX compatibility. Since we will probably never implement
full HP-UX support, we prefer to drop this compatibility to make it
easier for us with Linux userspace programs which mostly never checked
for both values. We don't expect major fall-outs because of this
change, and if we face some, we will simply rebuild the necessary
applications in the debian archives"
* 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: add flexible mmap memory layout support
parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc
parisc: convert uapi/asm/stat.h to use native types only
parisc: wire up sched_setattr and sched_getattr
parisc: fix cache-flushing
parisc/sti_console: prefer Linux fonts over built-in ROM fonts
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/console/sticore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 4ad24f2c6472..cecd3de01c24 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c @@ -488,7 +488,7 @@ static int sti_init_glob_cfg(struct sti_struct *sti, unsigned long rom_address, return 0; } -#ifdef CONFIG_FONTS +#ifdef CONFIG_FONT_SUPPORT static struct sti_cooked_font * sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) { |