r4328 - in dists/trunk/linux-2.6/debian/arch: . alpha i386 powerpc

[Simon Horman]

Author: horms
Date: 2005-10-06 15:03:29 +0000 (Thu, 06 Oct 2005)
New Revision: 4328

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
Log:
Revert config changes - the patches aren't being applied because 0experimental1 < 1. So all these changes are bogus. Instead I will rename the series file and everything should work again

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-06 14:46:29 UTC (rev 4327)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-06 15:03:29 UTC (rev 4328)
@@ -1564,6 +1564,7 @@
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_EZUSB=y
+# CONFIG_USB_EMI26 is not set
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m

Modified: dists/trunk/linux-2.6/debian/arch/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/config	2005-10-06 14:46:29 UTC (rev 4327)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-10-06 15:03:29 UTC (rev 4328)
@@ -578,4 +578,4 @@
 # CONFIG_SCTP_HMAC_NONE is not set
 CONFIG_SCTP_HMAC_SHA1=y
 # CONFIG_SCTP_HMAC_MD5 is not set
-# CONFIG_USB_EMI26 is not set
+

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-06 14:46:29 UTC (rev 4327)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-06 15:03:29 UTC (rev 4328)
@@ -322,6 +322,7 @@
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_IDEPNP=m
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_BLK_DEV_OFFBOARD is not set
@@ -444,6 +445,7 @@
 CONFIG_MD_RAID6=m
 CONFIG_MD_FAULTY=m
 CONFIG_DM_MULTIPATH_EMC=m
+CONFIG_FUSION=m
 CONFIG_FUSION_MAX_SGE=40
 CONFIG_FUSION_CTL=m
 CONFIG_FUSION_LAN=m
@@ -1916,12 +1918,3 @@
 CONFIG_HZ=1000
 CONFIG_PHYSICAL_START=0x100000
 # CONFIG_HOTPLUG_CPU is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-CONFIG_SCSI_QLA2XXX=m
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_FUSION=y
-# CONFIG_BLK_DEV_IDEPNP is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-10-06 14:46:29 UTC (rev 4327)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-10-06 15:03:29 UTC (rev 4328)
@@ -1258,4 +1258,3 @@
 # CONFIG_HZ_250 is not set
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
-CONFIG_MAC_FLOPPY=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	2005-10-06 14:46:29 UTC (rev 4327)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	2005-10-06 15:03:29 UTC (rev 4328)
@@ -6,6 +6,7 @@
 # CONFIG_IRPORT_SIR is not set
 CONFIG_PCMCIA_XIRTULIP=m
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_MAC_FLOPPY=y
 CONFIG_6xx=y
 # CONFIG_40x is not set
 # CONFIG_44x is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	2005-10-06 14:46:29 UTC (rev 4327)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	2005-10-06 15:03:29 UTC (rev 4328)
@@ -1,3 +1,4 @@
+CONFIG_MAC_FLOPPY=y
 # CONFIG_SMP is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_AUDIT is not set