[linux] 06/07: [armhf] Disable FB_OMAP2; it is redundant and conflicting with DRM_OMAP

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 5f5011c2d9e901ff7f7848c164bd46883b6d4304
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Apr 27 23:52:19 2016 +0200

    [armhf] Disable FB_OMAP2; it is redundant and conflicting with DRM_OMAP
---
 debian/changelog                 | 1 +
 debian/config/armhf/config.armmp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index db19307..2fcb309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 602a086..5549b69 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git