summaryrefslogtreecommitdiffstats
path: root/drivers/video/console
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-08 16:42:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-08 16:42:55 -0700
commitfa815580fb87d1b8c218f9eba8122b2fc3f1a68c (patch)
tree73965c970b8b3879d770ae3729ab5154ff38262f /drivers/video/console
parent85579ad7f1dfc0b72bb243b7227bc4f663035e71 (diff)
parent57817e619a215588739f3f644986c78b586b541b (diff)
downloadlinux-fa815580fb87d1b8c218f9eba8122b2fc3f1a68c.tar.gz
linux-fa815580fb87d1b8c218f9eba8122b2fc3f1a68c.tar.bz2
linux-fa815580fb87d1b8c218f9eba8122b2fc3f1a68c.zip
Merge tag 'fbdev-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev updates from Tomi Valkeinen: "Minor fixes and cleanups" * tag 'fbdev-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: video: fbdev: atmel_lcdfb: remove useless include video: fbdev: pxa168fb: Use devm_clk_get fbdev: ssd1307fb: fix error return code fbdev: fix snprintf() limit in show_bl_curve() video: fbdev: s3c-fb: Constify platform_device_id video: fbdev: atmel: fix warning for const return value video: fbdev: Drop owner assignment from platform_driver video: fbdev: Drop owner assignment from i2c_driver fbdev: remove unnecessary memset in vfb framebuffer: disable vgacon on microblaze arch fbdev: udlfb: remove unneeded initialization in few places fbdev: Allow compile test of GPIO consumers if !GPIOLIB fbdev: fix cea_modes array size
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 071280643db7..38da6e299149 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
+ !ARM64 && !ARC && !MICROBLAZE
default y
help
Saying Y here will allow you to use Linux in text mode through a