[kernel] r13682 - in dists/trunk/linux-2.6/debian/config: alpha amd64 arm hppa i386 i386/none i386/xen

[Maximilian Attems]

Author: maks
Date: Wed May 27 11:24:19 2009
New Revision: 13682

Log:
clean up old config options step 3

- x86: allow more than 8 cpus to be used on 32-bit
  4272ebfbefd0db40073f3ee5990bceaf2894f08b

- [CPUFREQ] powernow-k8: Always compile powernow-k8 driver with ACPI
  support
  57f4fa699195b761cbea90db5e38b4bc15610c7c

- x86: rename X86_GENERICARCH to X86_32_NON_STANDARD
  e0c7ae376a13fd79a4dad8becab51040d13dfa90

- x86: remove the Voyager 32-bit subarch
  965c7ecaf2e2b083d711a01ab33735a4bdeee1a4

- ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS
  detection
  c2b73d1458014a9f461b75bc1756a699a6c0781f

- [WATCHDOG] wdt.c: remove #ifdef CONFIG_WDT_501
  04bedfa542d90ac7a1bbf28287e9861d0da21576

Modified:
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/arm/config.footbridge
   dists/trunk/linux-2.6/debian/config/hppa/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
   dists/trunk/linux-2.6/debian/config/i386/xen/config

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	Wed May 27 11:24:16 2009	(r13681)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Wed May 27 11:24:19 2009	(r13682)
@@ -1396,9 +1396,3 @@
 ##
 CONFIG_SND_USB_USX2Y=m
 
-##
-## file: unknown
-##
-CONFIG_SND_CS4232=m
-CONFIG_WDT_501=y
-

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 27 11:24:16 2009	(r13681)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 27 11:24:19 2009	(r13682)
@@ -1445,9 +1445,3 @@
 ##
 CONFIG_SND_USB_USX2Y=m
 
-##
-## file: unknown
-##
-CONFIG_X86_PC=y
-CONFIG_X86_POWERNOW_K8_ACPI=y
-

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Wed May 27 11:24:16 2009	(r13681)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Wed May 27 11:24:19 2009	(r13682)
@@ -1471,5 +1471,4 @@
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_NO_IDLE_HZ is not set
-# CONFIG_SND_CS4232 is not set
 

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	Wed May 27 11:24:16 2009	(r13681)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Wed May 27 11:24:19 2009	(r13682)
@@ -830,8 +830,3 @@
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
-##
-## file: unknown
-##
-# CONFIG_SND_CS4232 is not set
-

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed May 27 11:24:16 2009	(r13681)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed May 27 11:24:19 2009	(r13682)
@@ -1664,13 +1664,3 @@
 ##
 CONFIG_SND_USB_USX2Y=m
 
-##
-## file: unknown
-##
-CONFIG_SND_CS4232=m
-CONFIG_WDT_501=y
-# CONFIG_X86_GENERICARCH is not set
-CONFIG_X86_PC=y
-CONFIG_X86_POWERNOW_K8_ACPI=y
-# CONFIG_X86_VOYAGER is not set
-

Modified: dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem	Wed May 27 11:24:16 2009	(r13681)
+++ dists/trunk/linux-2.6/debian/config/i386/none/config.686-bigmem	Wed May 27 11:24:19 2009	(r13682)
@@ -75,10 +75,3 @@
 ##
 # CONFIG_DEBUG_HIGHMEM is not set
 
-##
-## file: unknown
-##
-CONFIG_X86_GENERICARCH=y
-# CONFIG_X86_PC is not set
-# CONFIG_X86_VOYAGER is not set
-

Modified: dists/trunk/linux-2.6/debian/config/i386/xen/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen/config	Wed May 27 11:24:16 2009	(r13681)
+++ dists/trunk/linux-2.6/debian/config/i386/xen/config	Wed May 27 11:24:19 2009	(r13682)
@@ -1,2 +1 @@
-# CONFIG_X86_GENERICARCH is not set
 CONFIG_X86_XEN=y