Apus might build now. QLA2XXX can be set to n. Latter needed for former
svn path=/dists/trunk/linux-2.6/; revision=4518
This commit is contained in:
parent
c6e7ccc98a
commit
1d52bfbf89
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue