diff --git a/debian/changelog b/debian/changelog
index 1744d1c4d..376bab464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ linux-2.6 (2.6.31~rc3-1~experimental.1) UNRELEASED; urgency=low
   * Disable v4l1 ov511 and quickcam_messenger drivers.
   * [x86_64] Enable HW_RANDOM_VIA.
   * [x86] Keep divers staging stuff enabled.
-  * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS.
+  * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS, ACERHDF.
   * rtl8192su: remove firmware and disable.
 
   [ Ben Hutchings ]
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index c4280a586..958fa64d8 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -842,26 +842,6 @@ CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_TCIC=m
 
-##
-## file: drivers/platform/x86/Kconfig
-##
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_DELL_WMI=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_THINKPAD_ACPI=m
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_BAY=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-# CONFIG_INTEL_MENLOW is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
-
 ##
 ## file: drivers/pnp/Kconfig
 ##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 0c11c5a53..38e25d994 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -982,23 +982,7 @@ CONFIG_TCIC=m
 ##
 ## file: drivers/platform/x86/Kconfig
 ##
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_DELL_WMI=m
 CONFIG_TC1100_WMI=m
-CONFIG_SONYPI_COMPAT=y
-CONFIG_THINKPAD_ACPI=m
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_BAY=y
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-# CONFIG_INTEL_MENLOW is not set
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
 
 ##
 ## file: drivers/pnp/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index bbd277dc2..abfbcfe4b 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -170,6 +170,27 @@ CONFIG_XEN_KBDDEV_FRONTEND=y
 ##
 CONFIG_XEN_NETDEV_FRONTEND=m
 
+##
+## file: drivers/platform/x86/Kconfig
+##
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_DELL_WMI=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_THINKPAD_ACPI=m
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_BAY=y
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+# CONFIG_INTEL_MENLOW is not set
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ACPI_WMI=m
+CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_TOSHIBA=m
+
 ##
 ## file: drivers/staging/Kconfig
 ##