[armhf] Disable FB_OMAP2; it is redundant and conflicting with DRM_OMAP

This commit is contained in:
Ben Hutchings 2016-04-27 23:52:19 +02:00
parent 32586f7a95
commit 5f5011c2d9
2 changed files with 3 additions and 1 deletions

1
debian/changelog vendored
View File

@ -134,6 +134,7 @@ linux (4.5.2-1) UNRELEASED; urgency=medium
(Closes: #821741)
* tools/build: Fix bpf(2) feature test (fixes FTBFS on alpha, sh4;
closes: #822364)
* [armhf] Disable FB_OMAP2; it is redundant and conflicting with DRM_OMAP
[ Aurelien Jarno ]
* [mips*] Emulate unaligned LDXC1 and SDXC1 instructions.

View File

@ -1070,7 +1070,8 @@ CONFIG_FB_SIMPLE=y
##
## file: drivers/video/fbdev/omap2/omapfb/Kconfig
##
CONFIG_FB_OMAP2=m
#. Redundant and conflicting with DRM_OMAP
# CONFIG_FB_OMAP2 is not set
##
## file: drivers/virtio/Kconfig