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

[Simon Horman]

Author: horms
Date: 2005-10-06 13:30:59 +0000 (Thu, 06 Oct 2005)
New Revision: 4324

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:
A few more config file changes, i386 and powerpc should now work.

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-06 13:01:14 UTC (rev 4323)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-06 13:30:59 UTC (rev 4324)
@@ -1564,7 +1564,6 @@
 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 13:01:14 UTC (rev 4323)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-10-06 13:30:59 UTC (rev 4324)
@@ -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 13:01:14 UTC (rev 4323)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-06 13:30:59 UTC (rev 4324)
@@ -1923,6 +1923,5 @@
 CONFIG_FLATMEM=y
 CONFIG_SCSI_QLA2XXX=m
 # CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_USB_EMI26 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 13:01:14 UTC (rev 4323)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-10-06 13:30:59 UTC (rev 4324)
@@ -1258,3 +1258,4 @@
 # 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 13:01:14 UTC (rev 4323)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	2005-10-06 13:30:59 UTC (rev 4324)
@@ -6,7 +6,6 @@
 # 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 13:01:14 UTC (rev 4323)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	2005-10-06 13:30:59 UTC (rev 4324)
@@ -1,4 +1,3 @@
-CONFIG_MAC_FLOPPY=y
 # CONFIG_SMP is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_AUDIT is not set