diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 8063c61d6..da3a0fa15 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -73,7 +73,6 @@ CONFIG_BINFMT_AOUT=m 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_RIM_I=m 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=m # 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 diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 21e5ab206..4ad4e36a7 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -110,7 +110,6 @@ CONFIG_COMPAT=y 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_COM90xxIO=m 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_ATP=m CONFIG_DE620=m # CONFIG_FRAME_POINTER is not set CONFIG_DE600=m -CONFIG_NET_POCKET=y CONFIG_DCDBAS=m diff --git a/debian/arch/arm/config b/debian/arch/arm/config index 9936d4e4a..271aa4e0f 100644 --- a/debian/arch/arm/config +++ b/debian/arch/arm/config @@ -64,7 +64,6 @@ CONFIG_BINFMT_ELF=y # 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 diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 35b230fb0..ed34ec852 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -144,7 +144,6 @@ CONFIG_WINBOND_FIR=m # 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_NE2K_PCI=y # 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 diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 2e334d34a..bea26c214 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -309,7 +309,6 @@ CONFIG_NET_PKTGEN=m # 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 diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 7f7f97fdb..4cfeb48a7 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -98,7 +98,6 @@ CONFIG_IPV6=m # 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 diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index cd13ff4bf..6834cfa84 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -380,7 +380,6 @@ CONFIG_IP_TCPDIAG=y # 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 diff --git a/debian/arch/config b/debian/arch/config index 2343fdc85..b4a260175 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -647,7 +647,6 @@ CONFIG_USB_NET_GL620A=m 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_PCMCIA_PROBE=y # 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 diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 190d15684..8cbcb737f 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -79,7 +79,6 @@ CONFIG_BINFMT_ELF=y 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_DUMMY=m 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=m # 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 diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 81aa12a53..2b221bc23 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -161,7 +161,6 @@ CONFIG_HOTPLUG_PCI_SHPC=m # 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_RIM_I=m 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_SUNDANCE=m 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 diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index bfebfc87f..b75090680 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -85,7 +85,6 @@ CONFIG_PD6729=m 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_COM90xxIO=m # 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 diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index e8a269ecd..bea08f50c 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -44,7 +44,6 @@ CONFIG_BINFMT_MISC=m 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 diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga index 800e5ec7d..010a38180 100644 --- a/debian/arch/m68k/config.amiga +++ b/debian/arch/m68k/config.amiga @@ -88,7 +88,6 @@ CONFIG_IPX=m # 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_APNE=m # 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 diff --git a/debian/arch/m68k/config.bvme6000 b/debian/arch/m68k/config.bvme6000 index 8a5049b6a..ab25d2938 100644 --- a/debian/arch/m68k/config.bvme6000 +++ b/debian/arch/m68k/config.bvme6000 @@ -32,7 +32,6 @@ CONFIG_XFRM_USER=m # 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 diff --git a/debian/arch/m68k/config.hp b/debian/arch/m68k/config.hp index 4795796d9..15bdf8751 100644 --- a/debian/arch/m68k/config.hp +++ b/debian/arch/m68k/config.hp @@ -30,7 +30,6 @@ CONFIG_IPX=m # 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 diff --git a/debian/arch/m68k/config.mac b/debian/arch/m68k/config.mac index 58bcfd60c..3b5f01e8b 100644 --- a/debian/arch/m68k/config.mac +++ b/debian/arch/m68k/config.mac @@ -56,7 +56,6 @@ CONFIG_IPDDP=m 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 diff --git a/debian/arch/m68k/config.mvme147 b/debian/arch/m68k/config.mvme147 index 5d2740bf0..5d8ff846e 100644 --- a/debian/arch/m68k/config.mvme147 +++ b/debian/arch/m68k/config.mvme147 @@ -30,7 +30,6 @@ CONFIG_IPX=m # 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 diff --git a/debian/arch/m68k/config.mvme16x b/debian/arch/m68k/config.mvme16x index f1941abc4..3c30d80b2 100644 --- a/debian/arch/m68k/config.mvme16x +++ b/debian/arch/m68k/config.mvme16x @@ -33,7 +33,6 @@ CONFIG_IPX=m # 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 diff --git a/debian/arch/m68k/config.q40 b/debian/arch/m68k/config.q40 index 87cf9f062..18a1346a8 100644 --- a/debian/arch/m68k/config.q40 +++ b/debian/arch/m68k/config.q40 @@ -62,7 +62,6 @@ CONFIG_IPX=m # 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_MII=m # 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 diff --git a/debian/arch/m68k/config.sun3 b/debian/arch/m68k/config.sun3 index e0d583641..9d0f834a0 100644 --- a/debian/arch/m68k/config.sun3 +++ b/debian/arch/m68k/config.sun3 @@ -17,7 +17,6 @@ CONFIG_IPX=m # 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 diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 68244e0ef..88b3285e3 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -111,7 +111,6 @@ CONFIG_KERNEL_START=0xc0000000 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_COM90xxIO=m # 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=y CONFIG_HZ=1000 CONFIG_SND_POWERMAC_AUTO_DRC=y CONFIG_USB_APPLETOUCH=m +# CONFIG_SOFTWARE_SUSPEND is not set +CONFIG_HOTPLUG=y diff --git a/debian/arch/powerpc/config.apus b/debian/arch/powerpc/config.apus index 468dc50a3..5222d6ee4 100644 --- a/debian/arch/powerpc/config.apus +++ b/debian/arch/powerpc/config.apus @@ -31,7 +31,6 @@ CONFIG_POSIX_MQUEUE=y 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_BOOT_LOAD=0x00800000 # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set # @@ -525,7 +523,6 @@ CONFIG_TUN=m # 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 @@ CONFIG_LOG_BUF_SHIFT=14 # # Cryptographic options # -# CONFIG_CRYPTO is not set # # Hardware crypto devices # +# CONFIG_HWMON_VID is not set +CONFIG_NFS_ACL_SUPPORT=y +CONFIG_CRYPTO=y diff --git a/debian/arch/powerpc/config.powerpc b/debian/arch/powerpc/config.powerpc index 6997e86b7..0d5649467 100644 --- a/debian/arch/powerpc/config.powerpc +++ b/debian/arch/powerpc/config.powerpc @@ -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 diff --git a/debian/arch/powerpc/config.powerpc-smp b/debian/arch/powerpc/config.powerpc-smp index 860b8fcca..4db4451e4 100644 --- a/debian/arch/powerpc/config.powerpc-smp +++ b/debian/arch/powerpc/config.powerpc-smp @@ -4,5 +4,4 @@ CONFIG_STOP_MACHINE=y CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_NR_CPUS=4 -# CONFIG_SOFTWARE_SUSPEND is not set # CONFIG_MAC_FLOPPY is not set diff --git a/debian/arch/s390/config b/debian/arch/s390/config index 52603cccb..c78ad9528 100644 --- a/debian/arch/s390/config +++ b/debian/arch/s390/config @@ -37,7 +37,6 @@ CONFIG_NO_IDLE_HZ=y 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_LLC=y # 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 diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index c5a4bad61..4534cbd07 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -23,7 +23,6 @@ CONFIG_PARPORT_NOT_PC=y 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_NET_POLL_CONTROLLER=y # 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 diff --git a/debian/patches-debian/qla2xxx-removed.patch b/debian/patches-debian/qla2xxx-removed.patch index 811d0a497..8b1511a49 100644 --- a/debian/patches-debian/qla2xxx-removed.patch +++ b/debian/patches-debian/qla2xxx-removed.patch @@ -9,3 +9,12 @@ diff -aurN a/drivers/scsi/Makefile b/drivers/scsi/Makefile 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 +