diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 08:51:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-12 08:51:37 -0800 |
| commit | 56e9461a496488a73c54e550e1614068957267f8 (patch) | |
| tree | 4c108765aaa0d5f6f8cf11473367341ad0e9c7c3 /drivers | |
| parent | 709c12e3f5c5f3efd11d3fbd43d35535dc3a34d0 (diff) | |
| parent | 7c7808ce107d63e158dbbc3af085980985a0c3c4 (diff) | |
Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux
Pull Openrisc updates from Stafford Horne:
- changes to MAINTAINER for openrisc
- probably biggest actual change is the move to memblock from bootmem
- ... plus several bug and build fixes
* tag 'openrisc-for-linus' of git://github.com/openrisc/linux:
openrisc: prevent VGA console, fix builds
openrisc: include l.swa in check for write data pagefault
openrisc: Updates after openrisc.net has been lost
openrisc: Consolidate setup to use memblock instead of bootmem
openrisc: remove the redundant of_platform_populate
openrisc: add NR_CPUS Kconfig default value
openrisc: Support both old (or32) and new (or1k) toolchain
openrisc: Add thread-local storage (TLS) support
openrisc: restore all regs on rt_sigreturn
openrisc: fix PTRS_PER_PGD define
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/console/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 38da6e299149..c3f1fb9ee820 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -9,7 +9,7 @@ config VGA_CONSOLE depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \ !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \ (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \ - !ARM64 && !ARC && !MICROBLAZE + !ARM64 && !ARC && !MICROBLAZE && !OPENRISC default y help Saying Y here will allow you to use Linux in text mode through a |