diff --git a/debian/changelog b/debian/changelog
index db193076d..2fcb30944 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 602a08693..5549b6959 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