[kernel] r13967 - in dists/trunk/linux-2.6/debian: . config/amd64 config/i386 config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Sat Jul 18 15:48:53 2009
New Revision: 13967

Log:
x86 enable modular ACERHDF

centralize x86 platform drivers, just one is not x86_64.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Jul 18 15:48:46 2009	(r13966)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jul 18 15:48:53 2009	(r13967)
@@ -19,7 +19,7 @@
   * 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 ]

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Sat Jul 18 15:48:46 2009	(r13966)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Sat Jul 18 15:48:53 2009	(r13967)
@@ -843,26 +843,6 @@
 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
 ##
 CONFIG_PNP=y

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Sat Jul 18 15:48:46 2009	(r13966)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Sat Jul 18 15:48:53 2009	(r13967)
@@ -982,23 +982,7 @@
 ##
 ## 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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 15:48:46 2009	(r13966)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 15:48:53 2009	(r13967)
@@ -171,6 +171,27 @@
 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
 ##
 CONFIG_STAGING=y