diff --git a/debian/changelog b/debian/changelog
index d8862649f..acd293a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,7 @@ linux-2.6 (2.6.29~rc8-1~experimental.1) UNRELEASED; urgency=low
   * topconfig enable SND_HDA_HWDEP for sound debugging purpose.
   * topconfig enable USB_HIDDEV (closes: #517771)
   * [x86] set DELL_LAPTOP, COMEDI, X86_PTRACE_BTS, XENFS, XEN_COMPAT_XENFS,
-    X86_REROUTE_FOR_BROKEN_BOOT_IRQS.
+    X86_REROUTE_FOR_BROKEN_BOOT_IRQS, OPTIMIZE_INLINING.
   * [x86] unset DRM_I915_KMS due to upgrade path from Lenny override with
     modeset module param.
   * temp.image.plain/preinst: Consistent output.
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 304c89e4a..6332663a9 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -95,6 +95,7 @@ CONFIG_IO_DELAY_0X80=y
 ## end choice
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
 
 ##
 ## file: arch/x86/kernel/cpu/cpufreq/Kconfig
diff --git a/debian/config/i386/config b/debian/config/i386/config
index e2d4f1426..9eb213e85 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -143,6 +143,7 @@ CONFIG_IO_DELAY_0X80=y
 ## end choice
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
+CONFIG_OPTIMIZE_INLINING=y
 
 ##
 ## file: arch/x86/kernel/cpu/cpufreq/Kconfig