From 3cd6efebfc866b6757fe9cc9d5142cfd5744f0fa Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 28 Oct 2012 17:53:43 +0100 Subject: [PATCH] disbale scsi pci devices on nas device --- .../sablink/config/amd64/config.common.amd64 | 1 + .../sablink/config/armv5tel/config-arm-common | 65 +++++ .../config/armv5tel/config.common.armv5tel | 260 +++++------------- .../config/armv7a/config.common.armv7a | 1 + .../sablink/config/config.common.sablink | 1 - .../sablink/config/x86/config.common.x86 | 1 + 6 files changed, 141 insertions(+), 188 deletions(-) create mode 100644 Documentation/kernel-config/sablink/config/armv5tel/config-arm-common diff --git a/Documentation/kernel-config/sablink/config/amd64/config.common.amd64 b/Documentation/kernel-config/sablink/config/amd64/config.common.amd64 index f063d6d..e335b1b 100644 --- a/Documentation/kernel-config/sablink/config/amd64/config.common.amd64 +++ b/Documentation/kernel-config/sablink/config/amd64/config.common.amd64 @@ -189,6 +189,7 @@ CONFIG_RFS_ACCEL=y CONFIG_RPS=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_SCHED_BFS=y CONFIG_SCHED_MC=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_SECCOMP_FILTER=y diff --git a/Documentation/kernel-config/sablink/config/armv5tel/config-arm-common b/Documentation/kernel-config/sablink/config/armv5tel/config-arm-common new file mode 100644 index 0000000..dc8acb8 --- /dev/null +++ b/Documentation/kernel-config/sablink/config/armv5tel/config-arm-common @@ -0,0 +1,65 @@ +# CONFIG_PCCARD is not set +# CONFIG_DMA_SHARED_BUFFER is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_UFSHCD is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set +# CONFIG_FCOE is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_BFA_FC is not set +CONFIG_I2C_ALGOBIT=m +# CONFIG_DRM is not set +# CONFIG_STUB_POULSBO is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_IMAGEBLIT=m +CONFIG_FB_SYS_FILLRECT=m +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_I740 is not set +CONFIG_ZFS=m +CONFIG_SPL=m diff --git a/Documentation/kernel-config/sablink/config/armv5tel/config.common.armv5tel b/Documentation/kernel-config/sablink/config/armv5tel/config.common.armv5tel index 58fb583..11b4bda 100644 --- a/Documentation/kernel-config/sablink/config/armv5tel/config.common.armv5tel +++ b/Documentation/kernel-config/sablink/config/armv5tel/config.common.armv5tel @@ -99,20 +99,6 @@ CONFIG_ADXRS450=m CONFIG_AEABI=y CONFIG_AFFS_FS=m # CONFIG_AFS_FSCACHE is not set -CONFIG_AIC79XX_BUILD_FIRMWARE=y -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -# CONFIG_AIC79XX_DEBUG_ENABLE is not set -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -CONFIG_AIC7XXX_BUILD_FIRMWARE=y -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 -CONFIG_AIC7XXX_DEBUG_ENABLE=y -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_AIRO_CS=m CONFIG_ALIGNMENT_TRAP=y CONFIG_ALIM7101_WDT=m CONFIG_ALTERA_STAPL=m @@ -191,7 +177,6 @@ CONFIG_ARCNET_1051=m CONFIG_ARCNET_1201=m CONFIG_ARCNET_CAP=m CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_CS=m CONFIG_ARCNET_COM20020_PCI=m CONFIG_ARCNET_COM90xx=m CONFIG_ARCNET_COM90xxIO=m @@ -339,7 +324,6 @@ CONFIG_B43_HWRNG=y CONFIG_B43_LEDS=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCMCIA=y CONFIG_B43_PHY_HT=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y @@ -386,7 +370,7 @@ CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCM_WIMAX=m -CONFIG_BE2ISCSI=y +# CONFIG_BE2ISCSI is not set CONFIG_BE2NET=m # CONFIG_BEFS_DEBUG is not set CONFIG_BEFS_FS=m @@ -396,7 +380,7 @@ CONFIG_BINFMT_MISC=y CONFIG_BLK_CGROUP=y CONFIG_BLK_CPQ_CISS_DA=y CONFIG_BLK_CPQ_DA=y -CONFIG_BLK_DEV_3W_XXXX_RAID=y +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set CONFIG_BLK_DEV_CRYPTOLOOP=y CONFIG_BLK_DEV_DAC960=y CONFIG_BLK_DEV_DRBD=m @@ -435,7 +419,6 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_BSD_DISKLABEL=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_BT=m -CONFIG_BTREE=y CONFIG_BTRFS_FS=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set CONFIG_BTRFS_FS_POSIX_ACL=y @@ -446,13 +429,9 @@ CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_CMTP=m CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIDTL1=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIUART_BCSP=y @@ -489,7 +468,6 @@ CONFIG_CAN_C_CAN_PLATFORM=m # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_CAN_DEV=m CONFIG_CAN_EMS_PCI=m -CONFIG_CAN_EMS_PCMCIA=m CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m CONFIG_CAN_GW=m @@ -498,7 +476,6 @@ CONFIG_CAN_KVASER_PCI=m CONFIG_CAN_MCP251X=m CONFIG_CAN_PEAK_PCI=m CONFIG_CAN_PEAK_PCIEC=y -CONFIG_CAN_PEAK_PCMCIA=m CONFIG_CAN_PEAK_USB=m CONFIG_CAN_PLX_PCI=m CONFIG_CAN_RAW=m @@ -507,14 +484,10 @@ CONFIG_CAN_SJA1000_ISA=m CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m -CONFIG_CAN_SOFTING_CS=m CONFIG_CAN_VCAN=m CONFIG_CAPI_AVM=y CONFIG_CAPI_EICON=y CONFIG_CAPI_TRACE=y -CONFIG_CARDBUS=y -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m CONFIG_CARL9170=m # CONFIG_CARL9170_HWRNG is not set CONFIG_CARL9170_LEDS=y @@ -540,8 +513,10 @@ CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_REG_DEBUG is not set CONFIG_CFG80211_WEXT=y CONFIG_CFQ_GROUP_IOSCHED=y +CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUPS=y CONFIG_CGROUP_BFQIO=y +CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y @@ -549,6 +524,7 @@ CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_SCHED=y CONFIG_CHARGER_GPIO=m CONFIG_CHARGER_ISP1704=m CONFIG_CHARGER_LP8727=m @@ -556,7 +532,6 @@ CONFIG_CHARGER_MANAGER=y CONFIG_CHARGER_MAX8903=m CONFIG_CHARGER_PCF50633=m CONFIG_CHARGER_SMB347=m -CONFIG_CHECK_SIGNATURE=y CONFIG_CHELSIO_T1=m # CONFIG_CHELSIO_T1_1G is not set CONFIG_CHELSIO_T3=y @@ -709,7 +684,7 @@ CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set # CONFIG_DMATEST is not set CONFIG_DMA_ENGINE=y -CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_SHARED_BUFFER is not set CONFIG_DM_BUFIO=m CONFIG_DM_CRYPT=y # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set @@ -730,25 +705,7 @@ CONFIG_DNET=m CONFIG_DONGLE=y CONFIG_DRAGONRISE_FF=y # CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_DRM=y -CONFIG_DRM_AST=m -CONFIG_DRM_CIRRUS_QEMU=y -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m -CONFIG_DRM_KMS_HELPER=y -# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set -CONFIG_DRM_MGA=y -CONFIG_DRM_MGAG200=m -# CONFIG_DRM_NOUVEAU is not set -CONFIG_DRM_R128=y -# CONFIG_DRM_RADEON is not set -CONFIG_DRM_SAVAGE=y -CONFIG_DRM_TDFX=y -CONFIG_DRM_TTM=y -CONFIG_DRM_UDL=y -CONFIG_DRM_USB=y -CONFIG_DRM_VIA=y -CONFIG_DRM_VMWGFX=y +# CONFIG_DRM is not set CONFIG_DS1682=m CONFIG_DSCC4=m CONFIG_DSCC4_PCISYNC=y @@ -957,6 +914,7 @@ CONFIG_EXT4_FS=m CONFIG_EXTCON=m CONFIG_EXTCON_GPIO=m CONFIG_EZX_PCAP=y +CONFIG_FAIR_GROUP_SCHED=y CONFIG_FANOTIFY=y CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y CONFIG_FARSYNC=m @@ -974,17 +932,17 @@ CONFIG_FB_AUO_K190X=m # CONFIG_FB_BOOT_VESA_SUPPORT is not set # CONFIG_FB_BROADSHEET is not set # CONFIG_FB_CARMINE is not set -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_CFB_COPYAREA=m +CONFIG_FB_CFB_FILLRECT=m +CONFIG_FB_CFB_IMAGEBLIT=m # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set # CONFIG_FB_CIRRUS is not set CONFIG_FB_CON_DECOR=y # CONFIG_FB_CYBER2000 is not set -CONFIG_FB_DDC=m +# CONFIG_FB_DDC is not set CONFIG_FB_DEFERRED_IO=y # CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_I740=m +# CONFIG_FB_I740 is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_MACMODES is not set @@ -1006,10 +964,10 @@ CONFIG_FB_MODE_HELPERS=y CONFIG_FB_SM7XX=m CONFIG_FB_SMSCUFX=m # CONFIG_FB_SVGALIB is not set -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=m +CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_FOPS=m -CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_TRIDENT is not set @@ -1020,7 +978,7 @@ CONFIG_FB_UDL=m # CONFIG_FB_VT8623 is not set # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_XGI=m -CONFIG_FCOE=m +# CONFIG_FCOE is not set CONFIG_FDDI=y CONFIG_FEALNX=m CONFIG_FHANDLE=y @@ -1063,7 +1021,6 @@ CONFIG_FSCACHE=m CONFIG_FS_MBCACHE=m CONFIG_FS_XIP=y CONFIG_FT1000=m -CONFIG_FT1000_PCMCIA=m CONFIG_FT1000_USB=m # CONFIG_FTGMAC100 is not set CONFIG_FTL=m @@ -1214,13 +1171,11 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_HIPPI=y CONFIG_HISAX_16_3=y CONFIG_HISAX_1TR6=y -CONFIG_HISAX_AVM_A1_CS=m CONFIG_HISAX_AVM_A1_PCMCIA=y CONFIG_HISAX_BKM_A4T=y CONFIG_HISAX_DEBUG=y CONFIG_HISAX_DIEHLDIVA=y CONFIG_HISAX_ELSA=y -CONFIG_HISAX_ELSA_CS=m CONFIG_HISAX_ENTERNOW_PCI=y CONFIG_HISAX_EURO=y CONFIG_HISAX_FRITZPCI=y @@ -1241,15 +1196,12 @@ CONFIG_HISAX_NO_SENDCOMPLETE=y CONFIG_HISAX_S0BOX=y CONFIG_HISAX_SCT_QUADRO=y CONFIG_HISAX_SEDLBAUER=y -CONFIG_HISAX_SEDLBAUER_CS=m CONFIG_HISAX_ST5481=m CONFIG_HISAX_TELESPCI=y -CONFIG_HISAX_TELES_CS=m CONFIG_HISAX_W6692=y CONFIG_HMC6352=m CONFIG_HOLTEK_FF=y CONFIG_HOSTAP=m -CONFIG_HOSTAP_CS=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PCI=m @@ -1275,7 +1227,7 @@ CONFIG_HYSDN=m CONFIG_HYSDN_CAPI=y CONFIG_HZ=100 CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOBIT=m CONFIG_I2C_ALGOPCA=m CONFIG_I2C_ALI1535=m CONFIG_I2C_ALI1563=m @@ -1333,7 +1285,6 @@ CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_PROC=y CONFIG_I2O_SCSI=y CONFIG_I6300ESB_WDT=m -CONFIG_I82092=m CONFIG_ICPLUS_PHY=m CONFIG_ICS932S401=m CONFIG_IDE_PHISON=m @@ -1489,7 +1440,6 @@ CONFIG_IPW2200_MONITOR=y CONFIG_IPW2200_PROMISCUOUS=y CONFIG_IPW2200_QOS=y CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPWIRELESS=m CONFIG_IPX=m CONFIG_IPX_INTERN=y CONFIG_IP_DCCP_CCID3=y @@ -1576,10 +1526,8 @@ CONFIG_ISDN_DIVAS_MAINT=m CONFIG_ISDN_DIVAS_PRIPCI=y CONFIG_ISDN_DIVAS_USERIDI=m CONFIG_ISDN_DIVERSION=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m CONFIG_ISDN_DRV_AVMB1_C4=m CONFIG_ISDN_DRV_AVMB1_T1PCI=m # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set @@ -1758,7 +1706,6 @@ CONFIG_LIB80211_CRYPT_WEP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_LIBCRC32C=y CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_CS=m # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_LIBERTAS_SDIO=m @@ -1767,8 +1714,8 @@ CONFIG_LIBERTAS_THINFIRM=m # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_LIBERTAS_USB=m -CONFIG_LIBFC=y -CONFIG_LIBFCOE=y +# CONFIG_LIBFC is not set +# CONFIG_LIBFCOE is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_LINE6_USB=m @@ -1876,11 +1823,9 @@ CONFIG_MEDIA_TUNER_TUA9001=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC4000=m CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEGARAID_LEGACY=y -CONFIG_MEGARAID_MAILBOX=y -CONFIG_MEGARAID_MM=y -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_SAS=y +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_SAS is not set CONFIG_MEMORY=y CONFIG_MEMSTICK=m # CONFIG_MEMSTICK_DEBUG is not set @@ -1974,7 +1919,6 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_PXAV2=m CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_TEST=m CONFIG_MMC_TIFM_SD=m # CONFIG_MMC_UNSAFE_RESUME is not set @@ -2082,8 +2026,6 @@ CONFIG_MTD_OF_PARTS=m CONFIG_MTD_OOPS=m # CONFIG_MTD_OTP is not set CONFIG_MTD_PCI=m -CONFIG_MTD_PCMCIA=m -CONFIG_MTD_PCMCIA_ANONYMOUS=y # CONFIG_MTD_PHRAM is not set CONFIG_MTD_PHYSMAP=m # CONFIG_MTD_PHYSMAP_COMPAT is not set @@ -2244,7 +2186,6 @@ CONFIG_NET_VENDOR_DLINK=y CONFIG_NET_VENDOR_EMULEX=y CONFIG_NET_VENDOR_EXAR=y CONFIG_NET_VENDOR_FARADAY=y -CONFIG_NET_VENDOR_FUJITSU=y CONFIG_NET_VENDOR_HP=y CONFIG_NET_VENDOR_MELLANOX=y CONFIG_NET_VENDOR_MICROCHIP=y @@ -2262,7 +2203,6 @@ CONFIG_NET_VENDOR_TEHUTI=y CONFIG_NET_VENDOR_TI=y CONFIG_NET_VENDOR_VIA=y CONFIG_NET_VENDOR_WIZNET=y -CONFIG_NET_VENDOR_XIRCOM=y CONFIG_NEW_LEDS=y CONFIG_NFC=m CONFIG_NFC_HCI=m @@ -2435,7 +2375,6 @@ CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_NOT_PC=y CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_PCMCIA=m CONFIG_PARPORT_PC_SUPERIO=y CONFIG_PARPORT_SERIAL=m CONFIG_PARTITION_ADVANCED=y @@ -2469,7 +2408,6 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTI is not set # CONFIG_PATA_OPTIDMA is not set -# CONFIG_PATA_PCMCIA is not set # CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC_OLD is not set # CONFIG_PATA_RADISYS is not set @@ -2485,8 +2423,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set CONFIG_PC300TOO=m -CONFIG_PCCARD=y -CONFIG_PCCARD_NONSTATIC=y +# CONFIG_PCCARD is not set CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_PCH_CAN=m @@ -2506,29 +2443,7 @@ CONFIG_PCI_QUIRKS=y # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set # CONFIG_PCI_STUB is not set CONFIG_PCI_SYSCALL=y -CONFIG_PCMCIA=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_PCMCIA_AXNET=m -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_NINJA_SCSI=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_RAYCS=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_PCMCIA_SYM53C500=m -CONFIG_PCMCIA_WL3501=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_XIRCOM=m CONFIG_PCNET32=m -CONFIG_PD6729=m CONFIG_PDA_POWER=m # CONFIG_PDC_ADMA is not set CONFIG_PERF_USE_VMALLOC=y @@ -2536,7 +2451,6 @@ CONFIG_PHANTOM=m CONFIG_PHONE=m CONFIG_PHONET=m CONFIG_PHONE_IXJ=m -CONFIG_PHONE_IXJ_PCMCIA=m CONFIG_PHYLIB=y # CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_PID_NS=y @@ -2767,6 +2681,7 @@ CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set CONFIG_RTS_PSTOR=m # CONFIG_RTS_PSTOR_DEBUG is not set +CONFIG_RT_GROUP_SCHED=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RXKAD=m CONFIG_S2IO=m @@ -2792,86 +2707,74 @@ CONFIG_SBE_PMCC4_NCOMM=y CONFIG_SBP_TARGET=m CONFIG_SC92031=m CONFIG_SCA3000=m +CONFIG_SCHED_AUTOGROUP=y +# CONFIG_SCHED_BFS is not set CONFIG_SCSI=y -CONFIG_SCSI_3W_9XXX=y -CONFIG_SCSI_3W_SAS=y -CONFIG_SCSI_AACRAID=y +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_AACRAID is not set # CONFIG_SCSI_ACARD is not set -CONFIG_SCSI_ADVANSYS=y -CONFIG_SCSI_AIC79XX=y -CONFIG_SCSI_AIC7XXX=y -CONFIG_SCSI_AIC7XXX_OLD=y -CONFIG_SCSI_AIC94XX=y -CONFIG_SCSI_ARCMSR=y -CONFIG_SCSI_BFA_FC=m -CONFIG_SCSI_BNX2X_FCOE=y -CONFIG_SCSI_BNX2_ISCSI=y +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_SCSI_BFA_FC is not set +# CONFIG_SCSI_BNX2X_FCOE is not set +# CONFIG_SCSI_BNX2_ISCSI is not set # CONFIG_SCSI_CONSTANTS is not set -CONFIG_SCSI_CXGB3_ISCSI=y -CONFIG_SCSI_CXGB4_ISCSI=y -CONFIG_SCSI_DC390T=y -CONFIG_SCSI_DC395x=y +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_DC395x is not set CONFIG_SCSI_DH=m CONFIG_SCSI_DH_ALUA=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DMX3191D=y -CONFIG_SCSI_DPT_I2O=y +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_DPT_I2O is not set CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_FC_ATTRS=y -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_HPSA=y -CONFIG_SCSI_HPTIOP=y -CONFIG_SCSI_IMM=m -CONFIG_SCSI_INIA100=y -CONFIG_SCSI_INITIO=y -CONFIG_SCSI_IPR=y -CONFIG_SCSI_IPR_DUMP=y -CONFIG_SCSI_IPR_TRACE=y -CONFIG_SCSI_IPS=y +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_IPS is not set CONFIG_SCSI_ISCSI_ATTRS=y -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_SCSI_LPFC=y -# CONFIG_SCSI_LPFC_DEBUG_FS is not set +# CONFIG_SCSI_LPFC is not set CONFIG_SCSI_MOD=y -CONFIG_SCSI_MPT2SAS=y -# CONFIG_SCSI_MPT2SAS_LOGGING is not set -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -CONFIG_SCSI_MVSAS=y -CONFIG_SCSI_MVSAS_DEBUG=y -CONFIG_SCSI_MVSAS_TASKLET=y -CONFIG_SCSI_MVUMI=m -CONFIG_SCSI_NSP32=y +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_OSD_DEBUG is not set CONFIG_SCSI_OSD_DPRINT_SENSE=1 CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_PM8001=y -CONFIG_SCSI_PMCRAID=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_QLA_FC=y -CONFIG_SCSI_QLA_ISCSI=y -CONFIG_SCSI_QLOGIC_1280=y +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_QLOGIC_1280 is not set CONFIG_SCSI_SAS_ATA=y CONFIG_SCSI_SAS_ATTRS=y CONFIG_SCSI_SAS_HOST_SMP=y CONFIG_SCSI_SAS_LIBSAS=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_SRP=m +# CONFIG_SCSI_SRP is not set CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_STEX=y -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set CONFIG_SCSI_TGT=m -CONFIG_SCSI_UFSHCD=m +# CONFIG_SCSI_UFSHCD is not set CONFIG_SCSI_VIRTIO=m CONFIG_SDIO_UART=m CONFIG_SECURITYFS=y @@ -3004,7 +2907,6 @@ CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_ZL6100=m CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_CONSOLE is not set -CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_8250_DETECT_IRQ=y # CONFIG_SERIAL_8250_DW is not set # CONFIG_SERIAL_8250_EM is not set @@ -3174,11 +3076,9 @@ CONFIG_SND_OXYGEN=m CONFIG_SND_OXYGEN_LIB=m CONFIG_SND_PCI=y CONFIG_SND_PCM=m -CONFIG_SND_PCMCIA=y CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_PCXHR=m -CONFIG_SND_PDAUDIOCF=m CONFIG_SND_PORTMAN2X4=m CONFIG_SND_RAWMIDI=m CONFIG_SND_RAWMIDI_SEQ=m @@ -3306,7 +3206,6 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VMASTER=y CONFIG_SND_VX222=m -CONFIG_SND_VXPOCKET=m CONFIG_SND_VX_LIB=m CONFIG_SND_YMFPCI=m CONFIG_SOC_CAMERA=m @@ -3363,7 +3262,7 @@ CONFIG_SPI_SPIDEV=m CONFIG_SPI_TLE62X0=m CONFIG_SPI_TOPCLIFF_PCH=m CONFIG_SPI_XILINX=m -# CONFIG_SPL is not set +CONFIG_SPL=m CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set @@ -3381,8 +3280,6 @@ CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCMCIAHOST=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y CONFIG_SSB_SDIOHOST=y CONFIG_SSB_SDIOHOST_POSSIBLE=y CONFIG_SSB_SPROM=y @@ -3402,7 +3299,7 @@ CONFIG_STMMAC_RING=y CONFIG_STMPE_I2C=y CONFIG_STMPE_SPI=y CONFIG_STRICT_DEVMEM=y -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set # CONFIG_SUNGEM is not set @@ -3411,7 +3308,6 @@ CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SUN_PARTITION=y CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_CS=m CONFIG_SYNCLINK_GT=m CONFIG_SYN_COOKIES=y CONFIG_SYSV68_PARTITION=y @@ -3430,11 +3326,9 @@ CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_XACCT=y # CONFIG_TCG_TPM is not set -CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_PSCSI=m -CONFIG_TCM_QLA2XXX=m CONFIG_TCP_CONG_HSTCP=m CONFIG_TCP_CONG_ILLINOIS=m CONFIG_TCP_CONG_LP=m @@ -3857,7 +3751,6 @@ CONFIG_USB_SI470X=m CONFIG_USB_SIERRA_NET=m CONFIG_USB_SISUSBVGA=m # CONFIG_USB_SISUSBVGA_CON is not set -CONFIG_USB_SL811_CS=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_HCD_ISO=y CONFIG_USB_SN9C102=m @@ -3923,7 +3816,7 @@ CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VETH=m CONFIG_VFAT_FS=y # CONFIG_VFP is not set -CONFIG_VGASTATE=m +# CONFIG_VGASTATE is not set CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 CONFIG_VIA_RHINE=m @@ -4004,7 +3897,7 @@ CONFIG_VIDEO_MEM2MEM_TESTDEV=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_OUTPUT_CONTROL=y +# CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_PVRUSB2=m # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set @@ -4149,8 +4042,6 @@ CONFIG_WL1251_SDIO=m CONFIG_WL1251_SPI=m CONFIG_WL12XX=m CONFIG_WL12XX_PLATFORM_DATA=y -CONFIG_WLAGS49_H2=m -CONFIG_WLAGS49_H25=m CONFIG_WLCORE=m CONFIG_WLCORE_SDIO=m CONFIG_WLCORE_SPI=m @@ -4167,15 +4058,10 @@ CONFIG_XOR_BLOCKS=y CONFIG_XZ_DEC_TEST=m CONFIG_YAM=m CONFIG_YELLOWFIN=m -CONFIG_YENTA=m -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_TOSHIBA=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_ZEROPLUS_FF=y +CONFIG_ZFS=m CONFIG_ZONE_DMA_FLAG=0 diff --git a/Documentation/kernel-config/sablink/config/armv7a/config.common.armv7a b/Documentation/kernel-config/sablink/config/armv7a/config.common.armv7a index 9988f1d..fe6bb83 100644 --- a/Documentation/kernel-config/sablink/config/armv7a/config.common.armv7a +++ b/Documentation/kernel-config/sablink/config/armv7a/config.common.armv7a @@ -1771,6 +1771,7 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_MV=y CONFIG_SATA_PMP=y CONFIG_SCA3000=m +CONFIG_SCHED_BFS=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_SCSI=y diff --git a/Documentation/kernel-config/sablink/config/config.common.sablink b/Documentation/kernel-config/sablink/config/config.common.sablink index 338a43b..b487e74 100644 --- a/Documentation/kernel-config/sablink/config/config.common.sablink +++ b/Documentation/kernel-config/sablink/config/config.common.sablink @@ -508,7 +508,6 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y CONFIG_ROMFS_ON_BLOCK=y CONFIG_RT_MUTEXES=y # CONFIG_SAMPLES is not set -CONFIG_SCHED_BFS=y # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_DMA=y CONFIG_SCSI_LOGGING=y diff --git a/Documentation/kernel-config/sablink/config/x86/config.common.x86 b/Documentation/kernel-config/sablink/config/x86/config.common.x86 index 38ed3bc..d5b3b72 100644 --- a/Documentation/kernel-config/sablink/config/x86/config.common.x86 +++ b/Documentation/kernel-config/sablink/config/x86/config.common.x86 @@ -206,6 +206,7 @@ CONFIG_RFS_ACCEL=y CONFIG_RPS=y # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_SCHED_BFS=y CONFIG_SCHED_MC=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_SCSI_ENCLOSURE=m