r4518 - in dists/trunk/linux-2.6/debian: arch arch/alpha arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64 arch/m68k arch/powerpc arch/s390 arch/sparc patches-debian

Simon Horman horms at costa.debian.org
Tue Oct 18 11:12:05 UTC 2005 

Author: horms
Date: 2005-10-18 11:12:02 +0000 (Tue, 18 Oct 2005)
New Revision: 4518

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.rpc
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
   dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
   dists/trunk/linux-2.6/debian/arch/m68k/config.hp
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
   dists/trunk/linux-2.6/debian/arch/m68k/config.q40
   dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/sparc/config
   dists/trunk/linux-2.6/debian/patches-debian/qla2xxx-removed.patch
Log:
Apus might build now. QLA2XXX can be set to n. Latter needed for former

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -73,7 +73,6 @@
 CONFIG_OSF4_COMPAT=y
 CONFIG_BINFMT_EM86=m
 CONFIG_STANDALONE=y
-CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -601,7 +600,6 @@
 CONFIG_ARCNET_COM20020=m
 CONFIG_ARCNET_COM20020_ISA=m
 CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_NET_VENDOR_3COM=y
@@ -678,7 +676,6 @@
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_NET_POCKET=y
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_DL2K=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -110,7 +110,6 @@
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_UID16=y
 CONFIG_STANDALONE=y
-CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -627,7 +626,6 @@
 CONFIG_ARCNET_RIM_I=m
 CONFIG_ARCNET_COM20020=m
 CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_NET_VENDOR_3COM=y
@@ -1650,5 +1648,4 @@
 CONFIG_DE620=m
 # CONFIG_FRAME_POINTER is not set
 CONFIG_DE600=m
-CONFIG_NET_POCKET=y
 CONFIG_DCDBAS=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/arm/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -64,7 +64,6 @@
 # CONFIG_ARTHUR is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_RAM=y

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	2005-10-18 11:12:02 UTC (rev 4518)
@@ -144,7 +144,6 @@
 # CONFIG_DUMMY is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_ARCNET is not set
-CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 CONFIG_NET_VENDOR_3COM=y
@@ -185,7 +184,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_TLAN is not set
 # CONFIG_VIA_RHINE is not set
-# CONFIG_NET_POCKET is not set
 # CONFIG_DL2K is not set
 # CONFIG_E1000 is not set
 # CONFIG_NS83820 is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	2005-10-18 11:12:02 UTC (rev 4518)
@@ -309,7 +309,6 @@
 # CONFIG_IRDA is not set
 CONFIG_DUMMY=y
 # CONFIG_ARCNET is not set
-CONFIG_MII=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 # CONFIG_NET_VENDOR_3COM is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-10-18 11:12:02 UTC (rev 4518)
@@ -98,7 +98,6 @@
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_IRDA is not set
 # CONFIG_DUMMY is not set
-# CONFIG_MII is not set
 CONFIG_ARM_ETHER1=y
 CONFIG_ARM_ETHER3=y
 CONFIG_ARM_ETHERH=y

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	2005-10-18 11:12:02 UTC (rev 4518)
@@ -380,7 +380,6 @@
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_IRDA is not set
 # CONFIG_DUMMY is not set
-# CONFIG_MII is not set
 # CONFIG_NET_RADIO is not set
 # CONFIG_WAN is not set
 # CONFIG_PLIP is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -647,7 +647,6 @@
 CONFIG_FLATMEM=y
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_SCSI_QLA2XXX=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_HOSTAP_PLX=m
@@ -698,3 +697,7 @@
 # CONFIG_USB_APPLETOUCH is not set
 CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_FUSION=y
+# CONFIG_NET_POCKET is not set
+CONFIG_FW_LOADER=m
+CONFIG_MII=m
+# CONFIG_SCSI_QLA2XXX is not set

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -79,7 +79,6 @@
 CONFIG_BINFMT_MISC=m
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_MTD is not set
 CONFIG_PARPORT=m
@@ -447,7 +446,6 @@
 CONFIG_TUN=m
 # CONFIG_ARCNET is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_LASI_82596=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -525,7 +523,6 @@
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_NET_POCKET is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
 # CONFIG_E1000_NAPI is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -161,7 +161,6 @@
 # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set
 CONFIG_BINFMT_AOUT=m
 CONFIG_STANDALONE=y
-CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -727,7 +726,6 @@
 CONFIG_ARCNET_COM20020=m
 CONFIG_ARCNET_COM20020_ISA=m
 CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_MII=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_NET_VENDOR_3COM=y
@@ -801,7 +799,6 @@
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_NET_POCKET=y
 CONFIG_ATP=m
 CONFIG_DE600=m
 CONFIG_DE620=m

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -85,7 +85,6 @@
 CONFIG_TCIC=m
 CONFIG_PCCARD_NONSTATIC=m
 CONFIG_STANDALONE=y
-CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
@@ -539,7 +538,6 @@
 # CONFIG_ARCNET_RIM_I is not set
 CONFIG_ARCNET_COM20020=m
 CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_MII=m
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
 CONFIG_NET_VENDOR_3COM=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -44,7 +44,6 @@
 CONFIG_PROC_HARDWARE=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_MTD is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	2005-10-18 11:12:02 UTC (rev 4518)
@@ -88,7 +88,6 @@
 # CONFIG_DEV_APPLETALK is not set
 # CONFIG_ARCNET is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_ARIADNE=m
 CONFIG_A2065=m
 CONFIG_HYDRA=m
@@ -102,7 +101,6 @@
 # CONFIG_HP100 is not set
 # CONFIG_NET_ISA is not set
 # CONFIG_NET_PCI is not set
-# CONFIG_NET_POCKET is not set
 # CONFIG_TR is not set
 CONFIG_PLIP=m
 CONFIG_PPP_FILTER=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	2005-10-18 11:12:02 UTC (rev 4518)
@@ -32,7 +32,6 @@
 # CONFIG_IPX is not set
 # CONFIG_DEV_APPLETALK is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_BVME6000_NET=y
 # CONFIG_PPP_FILTER is not set
 CONFIG_PPP_ASYNC=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp	2005-10-18 11:12:02 UTC (rev 4518)
@@ -30,7 +30,6 @@
 # CONFIG_IPX_INTERN is not set
 # CONFIG_DEV_APPLETALK is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	2005-10-18 11:12:02 UTC (rev 4518)
@@ -56,7 +56,6 @@
 CONFIG_IPDDP_ENCAP=y
 CONFIG_IPDDP_DECAP=y
 CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
 CONFIG_MAC8390=y
 CONFIG_MAC89x0=y
 CONFIG_MACSONIC=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	2005-10-18 11:12:02 UTC (rev 4518)
@@ -30,7 +30,6 @@
 # CONFIG_IPX_INTERN is not set
 # CONFIG_DEV_APPLETALK is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_MVME147_NET=y
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_ASYNC=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	2005-10-18 11:12:02 UTC (rev 4518)
@@ -33,7 +33,6 @@
 # CONFIG_IPX_INTERN is not set
 # CONFIG_DEV_APPLETALK is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_MVME16x_NET=y
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_ASYNC=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40	2005-10-18 11:12:02 UTC (rev 4518)
@@ -62,7 +62,6 @@
 # CONFIG_DEV_APPLETALK is not set
 # CONFIG_ARCNET is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_SMC is not set
 # CONFIG_NET_VENDOR_RACAL is not set
@@ -72,7 +71,6 @@
 # CONFIG_NET_ISA is not set
 CONFIG_NE2000=m
 # CONFIG_NET_PCI is not set
-# CONFIG_NET_POCKET is not set
 # CONFIG_TR is not set
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_ASYNC=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	2005-10-18 11:12:02 UTC (rev 4518)
@@ -17,7 +17,6 @@
 # CONFIG_IPX_INTERN is not set
 # CONFIG_DEV_APPLETALK is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
 CONFIG_SUN3LANCE=y
 CONFIG_SUN3_82586=y
 CONFIG_PPP_FILTER=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -111,7 +111,6 @@
 CONFIG_TASK_SIZE=0x80000000
 CONFIG_BOOT_LOAD=0x00800000
 CONFIG_STANDALONE=y
-CONFIG_FW_LOADER=m
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_MTD is not set
 # CONFIG_PARPORT is not set
@@ -400,7 +399,6 @@
 # CONFIG_ARCNET_RIM_I is not set
 CONFIG_ARCNET_COM20020=m
 CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_MII=y
 CONFIG_MACE=m
 # CONFIG_MACE_AAUI_PORT is not set
 CONFIG_BMAC=m
@@ -1251,3 +1249,5 @@
 CONFIG_HZ=1000
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 CONFIG_USB_APPLETOUCH=m
+# CONFIG_SOFTWARE_SUSPEND is not set
+CONFIG_HOTPLUG=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	2005-10-18 11:12:02 UTC (rev 4518)
@@ -31,7 +31,6 @@
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_SYSCTL=y
-# CONFIG_HOTPLUG is not set
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 # CONFIG_EMBEDDED is not set
@@ -179,7 +178,6 @@
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
 # CONFIG_DEBUG_DRIVER is not set
 
 #
@@ -525,7 +523,6 @@
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
 CONFIG_ARIADNE=y
 CONFIG_A2065=y
 CONFIG_HYDRA=y
@@ -1072,8 +1069,10 @@
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
 
 #
 # Hardware crypto devices
 #
+# CONFIG_HWMON_VID is not set
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_CRYPTO=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc	2005-10-18 11:12:02 UTC (rev 4518)
@@ -1,6 +1,5 @@
 CONFIG_BROKEN_ON_SMP=y
 # CONFIG_SMP is not set
-CONFIG_SOFTWARE_SUSPEND=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_MKISS=m
 # CONFIG_IRPORT_SIR is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-smp	2005-10-18 11:12:02 UTC (rev 4518)
@@ -4,5 +4,4 @@
 CONFIG_SMP=y
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_NR_CPUS=4
-# CONFIG_SOFTWARE_SUSPEND is not set
 # CONFIG_MAC_FLOPPY is not set

Modified: dists/trunk/linux-2.6/debian/arch/s390/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -37,7 +37,6 @@
 CONFIG_NO_IDLE_HZ_INIT=y
 # CONFIG_PCMCIA is not set
 CONFIG_STANDALONE=y
-# CONFIG_FW_LOADER is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_ZFCP=m
 CONFIG_CCW=y
@@ -101,7 +100,6 @@
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_DUMMY is not set
-# CONFIG_MII is not set
 CONFIG_TR=y
 # CONFIG_NET_RADIO is not set
 # CONFIG_WAN is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	2005-10-18 11:12:02 UTC (rev 4518)
@@ -23,7 +23,6 @@
 CONFIG_PARPORT_SUNBPP=m
 CONFIG_PARPORT_1284=y
 CONFIG_PRINTER=m
-CONFIG_FW_LOADER=m
 CONFIG_FB=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
@@ -253,7 +252,6 @@
 # CONFIG_BT is not set
 CONFIG_DUMMY=m
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
 CONFIG_SUNLANCE=m
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNBMAC=m

Modified: dists/trunk/linux-2.6/debian/patches-debian/qla2xxx-removed.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/qla2xxx-removed.patch	2005-10-18 11:08:37 UTC (rev 4517)
+++ dists/trunk/linux-2.6/debian/patches-debian/qla2xxx-removed.patch	2005-10-18 11:12:02 UTC (rev 4518)
@@ -9,3 +9,12 @@
  obj-$(CONFIG_SCSI_LPFC)		+= lpfc/
  obj-$(CONFIG_SCSI_PAS16)	+= pas16.o
  obj-$(CONFIG_SCSI_SEAGATE)	+= seagate.o
+--- a/drivers/scsi/qla2xxx/Kconfig	2005-10-18 20:05:54.000000000 +0900
++++ b/drivers/scsi/qla2xxx/Kconfig	2005-10-18 20:06:07.000000000 +0900
+@@ -1,5 +1,5 @@
+ config SCSI_QLA2XXX
+ 	tristate
+-	default (SCSI && PCI)
++	default (n)
+ 	depends on SCSI && PCI
+

More information about the Kernel-svn-changes mailing list