diff --git a/debian/changelog b/debian/changelog
index 9c7a97117..681007bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ linux-2.6 (3.2.1-1~experimental.1) UNRELEASED; urgency=low
   * Install /lib/modules/<kernel-version>/modules.builtin in linux-image
     packages
   * [ia64] Add accept4() syscall (Closes: #647825)
-  * staging: Enable STAGING_MEDIA, which various drivers now depend on
+  * [x86] staging: Enable STAGING_MEDIA, which various drivers now depend on
     (Closes: #654800)
 
   [ Bastian Blank ]
diff --git a/debian/config/config b/debian/config/config
index 980831c42..eec6fcd8b 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2786,12 +2786,7 @@ CONFIG_STAGING=y
 ##
 ## file: drivers/staging/media/Kconfig
 ##
-CONFIG_STAGING_MEDIA=y
-
-##
-## file: drivers/staging/media/go7007/Kconfig
-##
-# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_STAGING_MEDIA is not set
 
 ##
 ## file: drivers/staging/panel/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index fe617e066..460420834 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1307,11 +1307,21 @@ CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_MOUSE=m
 
+##
+## file: drivers/staging/media/Kconfig
+##
+CONFIG_STAGING_MEDIA=y
+
 ##
 ## file: drivers/staging/media/easycap/Kconfig
 ##
 CONFIG_EASYCAP=m
 
+##
+## file: drivers/staging/media/go7007/Kconfig
+##
+# CONFIG_VIDEO_GO7007 is not set
+
 ##
 ## file: drivers/staging/media/lirc/Kconfig
 ##