diff --git a/debian/changelog b/debian/changelog
index 647139879..8dd8572a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -357,6 +357,7 @@ linux (4.9.5-1) UNRELEASED; urgency=medium
   * [x86] ASoC: Intel: select DW_DMAC_CORE since it's mandatory
   * [x86] sound/soc/intel: Enable SND_SOC_INTEL_BDW_RT5677_MACH as module
     (Closes: #851916)
+  * [arm64] video/fbdev: Change FB from module to built-in
 
   [ Salvatore Bonaccorso ]
   * tmpfs: clear S_ISGID when setting posix ACLs (CVE-2017-5551)
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 144e307c2..b6c850c92 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -878,7 +878,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=m
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=m
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 5512b03f6..40ccc0bf9 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1182,7 +1182,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_ARMCLCD=y
 CONFIG_FB_VT8500=y
 CONFIG_FB_WM8505=y
diff --git a/debian/config/config b/debian/config/config
index 9dabf1feb..c0d954d69 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4866,6 +4866,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
+CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_ARC=m
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index dafc02118..c9735040c 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -521,7 +521,6 @@ CONFIG_STI_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_CIRRUS is not set
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index 78b9267b1..3ea97187a 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -55,11 +55,6 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 
-##
-## file: drivers/video/fbdev/Kconfig
-##
-CONFIG_FB=y
-
 ##
 ## file: init/Kconfig
 ##
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index d78f46908..db8641c4f 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -794,7 +794,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=m
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index 7f2e07da6..0ca9d15e4 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -472,7 +472,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_CIRRUS is not set
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 04c4037a3..eb14e6a68 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1758,7 +1758,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_CIRRUS=m
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 6e53eb353..dda72de82 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -563,7 +563,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_FOREIGN_ENDIAN=y
 ## choice: Choice endianness support
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index cff53f997..efcda6676 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -160,6 +160,11 @@ CONFIG_ZFCP=m
 ##
 CONFIG_HVC_IUCV=y
 
+##
+## file: drivers/video/fbdev/Kconfig
+##
+# CONFIG_FB is not set
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##
diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index c17f6812a..7ddd7a790 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -162,7 +162,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_SM501=y
 
 ##
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index c4fa1f581..d26ade621 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -207,7 +207,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 ##
 ## file: drivers/video/fbdev/Kconfig
 ##
-CONFIG_FB=y
 CONFIG_FB_SM501=y
 
 ##