r4525 - in dists/trunk/linux-2.6/debian/arch: . amd64

[Frederik Schüler]

Author: fschueler-guest
Date: 2005-10-18 21:31:59 +0000 (Tue, 18 Oct 2005)
New Revision: 4525

Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
   dists/trunk/linux-2.6/debian/arch/config
Log:
Revert CONFIG_BLK_DEV_IDEPNP change. For which reasons was it deactivated?
Re-activate various new sensors and watchdog chips on amd64.
Re-activate SPARSEMEM on k8-smp flavour.



Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	2005-10-18 20:54:35 UTC (rev 4524)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	2005-10-18 21:31:59 UTC (rev 4525)
@@ -1649,3 +1649,8 @@
 # CONFIG_FRAME_POINTER is not set
 CONFIG_DE600=m
 CONFIG_DCDBAS=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_IBMASR=m
+CONFIG_SBC8360_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_I6300ESB_WDT=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	2005-10-18 20:54:35 UTC (rev 4524)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	2005-10-18 21:31:59 UTC (rev 4525)
@@ -33,3 +33,6 @@
 CONFIG_DIGIEPCA=m
 CONFIG_MKISS=m
 # CONFIG_FLATMEM_MANUAL is not set
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/config	2005-10-18 20:54:35 UTC (rev 4524)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-10-18 21:31:59 UTC (rev 4525)
@@ -685,7 +685,6 @@
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_DELL_RBU=m
 CONFIG_FB_SOFT_CURSOR=y
-# CONFIG_BLK_DEV_IDEPNP is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FUSION_MAX_SGE=40
@@ -701,3 +700,4 @@
 CONFIG_FW_LOADER=m
 CONFIG_MII=m
 # CONFIG_SCSI_QLA2XXX is not set
+CONFIG_BLK_DEV_IDEPNP=m