Author: waldi Date: Fri Mar 14 12:03:09 2008 New Revision: 10839 Log: debian/config/config, debian/config/powerpc/config, debian/config/s390: Remove silent options.
Modified: dists/trunk/linux-2.6/debian/config/config dists/trunk/linux-2.6/debian/config/powerpc/config dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 dists/trunk/linux-2.6/debian/config/s390/config Modified: dists/trunk/linux-2.6/debian/config/config ============================================================================== --- dists/trunk/linux-2.6/debian/config/config (original) +++ dists/trunk/linux-2.6/debian/config/config Fri Mar 14 12:03:09 2008 @@ -10,7 +10,6 @@ ## ## file: block/Kconfig.iosched ## -CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y @@ -20,17 +19,12 @@ CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set ## end choice -CONFIG_DEFAULT_IOSCHED="cfq" ## ## file: crypto/Kconfig ## -CONFIG_XOR_BLOCKS=m CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_BLKCIPHER=m CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_XCBC=m @@ -56,7 +50,6 @@ CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m @@ -76,12 +69,6 @@ CONFIG_CRYPTO_LZO=m ## -## file: crypto/async_tx/Kconfig -## -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m - -## ## file: drivers/acpi/Kconfig ## CONFIG_ACPI_DOCK=m @@ -90,8 +77,6 @@ ## file: drivers/ata/Kconfig ## CONFIG_ATA=m -# CONFIG_ATA_NONSTANDARD is not set -CONFIG_ATA_ACPI=y CONFIG_SATA_AHCI=m CONFIG_SATA_SVW=m CONFIG_ATA_PIIX=m @@ -170,13 +155,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=m # CONFIG_DEBUG_DEVRES is not set -# CONFIG_SYS_HYPERVISOR is not set ## ## file: drivers/block/Kconfig ## CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 # CONFIG_BLK_DEV_XIP is not set @@ -201,7 +184,6 @@ CONFIG_PC8736x_GPIO=m CONFIG_NSC_GPIO=m CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y ## ## file: drivers/char/drm/Kconfig @@ -248,7 +230,6 @@ ## ## file: drivers/dma/Kconfig ## -CONFIG_DMA_ENGINE=y CONFIG_NET_DMA=y ## @@ -286,7 +267,6 @@ ## file: drivers/hwmon/Kconfig ## CONFIG_HWMON=y -CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m CONFIG_SENSORS_AD7418=m @@ -320,11 +300,6 @@ # CONFIG_HWMON_DEBUG_CHIP is not set ## -## file: drivers/i2c/Kconfig -## -CONFIG_I2C_BOARDINFO=y - -## ## file: drivers/i2c/busses/Kconfig ## CONFIG_I2C_OCORES=m @@ -366,8 +341,6 @@ CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y ## ## file: drivers/infiniband/hw/amso1100/Kconfig @@ -525,7 +498,6 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_TUNER_CUSTOMIZE is not set CONFIG_TUNER_TEA5761=y CONFIG_DAB=y @@ -710,7 +682,6 @@ CONFIG_VIDEO_SAA5249=m CONFIG_TUNER_3036=m CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN_ZR36060=m CONFIG_VIDEO_ZORAN=m CONFIG_VIDEO_ZORAN_BUZ=m CONFIG_VIDEO_ZORAN_DC10=m @@ -800,7 +771,6 @@ ## ## file: drivers/media/video/usbvideo/Kconfig ## -CONFIG_VIDEO_USBVIDEO=m CONFIG_USB_QUICKCAM_MESSENGER=m ## @@ -998,12 +968,10 @@ CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m -CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_TEHUTI=m CONFIG_PPP_MPPE=m CONFIG_PPPOL2TP=m -CONFIG_SLHC=m CONFIG_NETCONSOLE_DYNAMIC=y ## @@ -1211,10 +1179,8 @@ # CONFIG_PARPORT_PC_FIFO is not set # CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m -# CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m CONFIG_PARPORT_1284=y -CONFIG_PARPORT_NOT_PC=y ## ## file: drivers/pci/Kconfig @@ -1236,7 +1202,6 @@ CONFIG_YENTA_TI=y CONFIG_YENTA_ENE_TUNE=y CONFIG_YENTA_TOSHIBA=y -CONFIG_PCMCIA_PROBE=y ## ## file: drivers/power/Kconfig @@ -1249,7 +1214,6 @@ ## ## file: drivers/rtc/Kconfig ## -CONFIG_RTC_LIB=m CONFIG_RTC_CLASS=m CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_INTF_PROC=y @@ -1285,9 +1249,7 @@ ## CONFIG_RAID_ATTRS=m CONFIG_SCSI=m -CONFIG_SCSI_DMA=y CONFIG_SCSI_TGT=m -CONFIG_SCSI_NETLINK=y CONFIG_SCSI_PROC_FS=y CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m @@ -1301,7 +1263,6 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_SCSI_WAIT_SCAN=m CONFIG_SCSI_SPI_ATTRS=m CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_FC_TGT_ATTRS=y @@ -1399,7 +1360,6 @@ ## CONFIG_SPI=y # CONFIG_SPI_DEBUG is not set -CONFIG_SPI_MASTER=y CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_LM70_LLP=m @@ -1423,7 +1383,6 @@ ## file: drivers/usb/Kconfig ## CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_EHCI=y ## ## file: drivers/usb/atm/Kconfig @@ -1444,7 +1403,6 @@ ## # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FS is not set -CONFIG_USB_GADGET_SELECTED=y ## choice: USB Peripheral Controller # CONFIG_USB_GADGET_AMD5536UDC is not set # CONFIG_USB_GADGET_FSL_USB2 is not set @@ -1547,12 +1505,7 @@ ## ## file: drivers/video/Kconfig ## -CONFIG_VGASTATE=m CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -# CONFIG_FB_BACKLIGHT is not set CONFIG_FB_ARC=m # CONFIG_FB_UVESA is not set # CONFIG_FB_NVIDIA_DEBUG is not set @@ -1635,7 +1588,6 @@ CONFIG_EXT4DEV_FS_POSIX_ACL=y CONFIG_EXT4DEV_FS_SECURITY=y # CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m # CONFIG_JBD2_DEBUG is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set @@ -1666,7 +1618,6 @@ CONFIG_JOLIET=y CONFIG_ZISOFS=y CONFIG_UDF_FS=m -CONFIG_FAT_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 @@ -1716,13 +1667,10 @@ CONFIG_NFS_V4=y # CONFIG_NFS_DIRECTIO is not set CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SUNRPC_BIND34=y CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m @@ -1836,14 +1784,11 @@ ## ## file: init/Kconfig ## -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_EXPERIMENTAL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y @@ -1864,7 +1809,6 @@ CONFIG_USER_SCHED=y ## end choice CONFIG_CGROUP_CPUACCT=y -CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y CONFIG_PROC_PID_CPUSET=y CONFIG_RELAY=y @@ -1874,7 +1818,6 @@ CONFIG_PID_NS=y CONFIG_BLK_DEV_INITRD=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y @@ -1884,7 +1827,6 @@ CONFIG_ELF_CORE=y # CONFIG_COMPAT_BRK is not set CONFIG_FUTEX=y -CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y @@ -1897,8 +1839,6 @@ # CONFIG_SLOB is not set ## end choice # CONFIG_MARKERS is not set -CONFIG_RT_MUTEXES=y -# CONFIG_TINY_SHMEM is not set CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y @@ -1914,7 +1854,6 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set ## end choice -CONFIG_HZ=250 ## ## file: kernel/Kconfig.preempt @@ -1928,21 +1867,10 @@ ## ## file: lib/Kconfig ## -CONFIG_BITREVERSE=y CONFIG_CRC16=m CONFIG_CRC_ITU_T=m CONFIG_CRC7=m CONFIG_LIBCRC32C=m -CONFIG_AUDIT_GENERIC=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_PLIST=y -CONFIG_CHECK_SIGNATURE=y ## ## file: lib/Kconfig.debug @@ -1973,14 +1901,6 @@ # CONFIG_BACKTRACE_SELF_TEST is not set ## -## file: mm/Kconfig -## -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -# CONFIG_SPARSEMEM_STATIC is not set - -## ## file: net/Kconfig ## CONFIG_NET=y @@ -1991,7 +1911,6 @@ CONFIG_NETFILTER_ADVANCED=y CONFIG_BRIDGE_NETFILTER=y CONFIG_NET_PKTGEN=m -CONFIG_FIB_RULES=y ## ## file: net/8021q/Kconfig @@ -2041,8 +1960,6 @@ ## file: net/dccp/Kconfig ## CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m -CONFIG_IP_DCCP_ACKVEC=y # CONFIG_IP_DCCP_DEBUG is not set ## @@ -2053,7 +1970,6 @@ CONFIG_IP_DCCP_CCID3=m # CONFIG_IP_DCCP_CCID3_DEBUG is not set CONFIG_IP_DCCP_CCID3_RTO=100 -CONFIG_IP_DCCP_TFRC_LIB=m ## ## file: net/decnet/netfilter/Kconfig @@ -2084,7 +2000,6 @@ CONFIG_ASK_IP_FIB_HASH=y # CONFIG_IP_FIB_TRIE is not set ## end choice -CONFIG_IP_FIB_HASH=y CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_VERBOSE=y @@ -2100,14 +2015,11 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=m CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=y CONFIG_TCP_CONG_CUBIC=m @@ -2129,7 +2041,6 @@ # CONFIG_DEFAULT_WESTWOOD is not set # CONFIG_DEFAULT_RENO is not set ## end choice -CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set ## @@ -2171,19 +2082,10 @@ CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=m CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m @@ -2205,8 +2107,6 @@ CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=y -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m @@ -2253,7 +2153,6 @@ ## ## file: net/netfilter/Kconfig ## -CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m @@ -2261,7 +2160,6 @@ CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_GRE=m CONFIG_NF_CT_PROTO_SCTP=m CONFIG_NF_CT_PROTO_UDPLITE=m CONFIG_NF_CONNTRACK_AMANDA=m @@ -2354,11 +2252,9 @@ CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m CONFIG_CLS_U32_PERF=y @@ -2383,7 +2279,6 @@ CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y ## ## file: net/sctp/Kconfig @@ -2425,7 +2320,6 @@ ## ## file: net/xfrm/Kconfig ## -CONFIG_XFRM=y CONFIG_XFRM_USER=m # CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_MIGRATE is not set @@ -2465,14 +2359,8 @@ # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set ## -## file: sound/Kconfig -## -CONFIG_AC97_BUS=m - -## ## file: sound/core/Kconfig ## -CONFIG_SND_RAWMIDI=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y # CONFIG_SND_DYNAMIC_MINORS is not set @@ -2486,12 +2374,6 @@ CONFIG_SND_PORTMAN2X4=m ## -## file: sound/isa/Kconfig -## -CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB16_DSP=m - -## ## file: sound/pci/Kconfig ## CONFIG_SND_AD1889=m Modified: dists/trunk/linux-2.6/debian/config/powerpc/config ============================================================================== --- dists/trunk/linux-2.6/debian/config/powerpc/config (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config Fri Mar 14 12:03:09 2008 @@ -6,28 +6,15 @@ ## ## file: arch/powerpc/Kconfig ## -CONFIG_PPC_MERGE=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_PPC=y -CONFIG_GENERIC_NVRAM=y -CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -CONFIG_PPC_OF=y -# CONFIG_GENERIC_TBSYNC is not set CONFIG_HIGHMEM=y # CONFIG_HOTPLUG_CPU is not set CONFIG_KEXEC=y CONFIG_PPCBUG_NVRAM=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttyS0,9600 console=tty0" -CONFIG_ISA_DMA_API=y # CONFIG_ISA is not set -CONFIG_GENERIC_ISA_DMA=y -CONFIG_PPC_INDIRECT_PCI=y CONFIG_PCI=y -CONFIG_PCI_DOMAINS=y # CONFIG_ADVANCED_OPTIONS is not set CONFIG_HIGHMEM_START=0xfe000000 CONFIG_LOWMEM_SIZE=0x30000000 @@ -53,12 +40,7 @@ # CONFIG_PPC_83xx is not set # CONFIG_PPC_86xx is not set ## end choice -CONFIG_MPIC=y -CONFIG_PPC_I8259=y -# CONFIG_RTAS_ERROR_LOGGING is not set CONFIG_RTAS_PROC=y -# CONFIG_MMIO_NVRAM is not set -CONFIG_PPC_MPC106=y CONFIG_CPU_FREQ_PMAC=y CONFIG_PPC601_SYNC_FIX=y CONFIG_TAU=y @@ -71,13 +53,6 @@ # CONFIG_PPC_LITE5200 is not set ## -## file: arch/powerpc/platforms/Kconfig.cputype -## -CONFIG_PPC_FPU=y -CONFIG_PPC_STD_MMU=y -CONFIG_PPC_STD_MMU_32=y - -## ## file: arch/powerpc/platforms/powermac/Kconfig ## CONFIG_PPC_PMAC=y @@ -106,7 +81,6 @@ CONFIG_ATM_IDT77252=m # CONFIG_ATM_IDT77252_DEBUG is not set # CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y CONFIG_ATM_AMBASSADOR=m # CONFIG_ATM_AMBASSADOR_DEBUG is not set CONFIG_ATM_HORIZON=m @@ -118,7 +92,6 @@ CONFIG_ATM_FORE200E_USE_TASKLET=y CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_FORE200E=m CONFIG_ATM_HE=m # CONFIG_ATM_HE_USE_SUNI is not set @@ -168,7 +141,6 @@ ## CONFIG_VT=y CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_PRINTER=m CONFIG_HVC_RTAS=y @@ -212,7 +184,6 @@ ## file: drivers/cpufreq/Kconfig ## CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y @@ -336,11 +307,9 @@ CONFIG_BLK_DEV_IDETAPE=m CONFIG_BLK_DEV_IDEFLOPPY=m # CONFIG_IDE_GENERIC is not set -CONFIG_BLK_DEV_IDEPCI=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=m # CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=m # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set @@ -367,8 +336,6 @@ CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y CONFIG_BLK_DEV_IDEDMA_PMAC=y # CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_BLK_DEV_HD is not set ## ## file: drivers/input/Kconfig @@ -541,20 +508,6 @@ CONFIG_PMAC_RACKMETER=m ## -## file: drivers/media/Kconfig -## -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m - -## -## file: drivers/media/common/Kconfig -## -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m - -## ## file: drivers/media/dvb/dvb-core/Kconfig ## CONFIG_DVB_CORE=m @@ -685,9 +638,7 @@ # CONFIG_SLIP_MODE_SLIP6 is not set CONFIG_NET_FC=y CONFIG_NETCONSOLE=m -CONFIG_NETPOLL=y CONFIG_NETPOLL_TRAP=y -CONFIG_NET_POLL_CONTROLLER=y ## ## file: drivers/net/appletalk/Kconfig @@ -836,7 +787,6 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_TCIC=m -CONFIG_PCCARD_NONSTATIC=m ## ## file: drivers/scsi/Kconfig @@ -899,8 +849,6 @@ CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG_CONSOLE=y CONFIG_SERIAL_JSM=m @@ -915,8 +863,6 @@ ## ## file: drivers/usb/Kconfig ## -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB=y ## @@ -938,7 +884,6 @@ CONFIG_USB_DEVICEFS=y CONFIG_USB_DYNAMIC_MINORS=y # CONFIG_USB_SUSPEND is not set -# CONFIG_USB_OTG is not set ## ## file: drivers/usb/gadget/Kconfig @@ -951,9 +896,9 @@ # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_OTG is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set ## end choice -CONFIG_USB_GADGET_DUALSPEED=y ## choice: USB Gadget Drivers CONFIG_USB_ZERO=m CONFIG_USB_ETH=m @@ -1022,8 +967,6 @@ ## file: drivers/video/Kconfig ## CONFIG_FB=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_MACMODES=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y CONFIG_FB_CIRRUS=m @@ -1074,7 +1017,6 @@ ## file: drivers/video/console/Kconfig ## CONFIG_VGA_CONSOLE=y -CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y @@ -1101,11 +1043,6 @@ CONFIG_USBPCWATCHDOG=m ## -## file: fs/Kconfig -## -CONFIG_JBD=m - -## ## file: fs/partitions/Kconfig ## # CONFIG_ACORN_PARTITION is not set @@ -1159,7 +1096,6 @@ # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -CONFIG_SPLIT_PTLOCK_CPUS=4 ## ## file: net/atm/Kconfig @@ -1267,7 +1203,6 @@ ## ## file: net/llc/Kconfig ## -CONFIG_LLC=y CONFIG_LLC2=m ## @@ -1313,12 +1248,8 @@ ## ## file: sound/core/Kconfig ## -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m CONFIG_SND_SEQUENCER=m # CONFIG_SND_SEQ_DUMMY is not set -CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_SEQUENCER_OSS=y @@ -1328,10 +1259,6 @@ ## ## file: sound/drivers/Kconfig ## -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m # CONFIG_SND_DUMMY is not set # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set @@ -1339,11 +1266,6 @@ # CONFIG_SND_MPU401 is not set ## -## file: sound/oss/dmasound/Kconfig -## -CONFIG_DMASOUND=m - -## ## file: sound/pci/Kconfig ## CONFIG_SND_ALS4000=m @@ -1369,7 +1291,6 @@ CONFIG_SND_ES1968=m CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_FM801_TEA575X=m CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDSP=m CONFIG_SND_ICE1712=m Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc ============================================================================== --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Fri Mar 14 12:03:09 2008 @@ -1,9 +1,4 @@ ## -## file: arch/powerpc/platforms/Kconfig -## -CONFIG_CLASSIC32=y - -## ## file: arch/powerpc/platforms/512x/Kconfig ## # CONFIG_MPC5121_ADS is not set Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot ============================================================================== --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot Fri Mar 14 12:03:09 2008 @@ -1,7 +1,6 @@ ## ## file: arch/powerpc/Kconfig ## -CONFIG_PPC32=y # CONFIG_HIGHMEM is not set ## @@ -12,7 +11,6 @@ ## ## file: arch/powerpc/platforms/Kconfig ## -CONFIG_CLASSIC32=y # CONFIG_TAU is not set ## @@ -35,7 +33,6 @@ ## ## file: block/Kconfig.iosched ## -CONFIG_IOSCHED_NOOP=y # CONFIG_IOSCHED_AS is not set CONFIG_IOSCHED_DEADLINE=y # CONFIG_IOSCHED_CFQ is not set @@ -145,7 +142,6 @@ CONFIG_EMBEDDED=y # CONFIG_BASE_FULL is not set # CONFIG_PROFILING is not set -CONFIG_BASE_SMALL=1 ## ## file: kernel/power/Kconfig Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 ============================================================================== --- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 (original) +++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Fri Mar 14 12:03:09 2008 @@ -6,25 +6,13 @@ ## ## file: arch/powerpc/Kconfig ## -CONFIG_PPC_MERGE=y -CONFIG_COMPAT=y -CONFIG_SYSVIPC_COMPAT=y -CONFIG_GENERIC_TBSYNC=y -CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_IOMMU_VMERGE=y CONFIG_IRQ_ALL_CPUS=y CONFIG_NUMA=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_NODES_SPAN_OTHER_NODES=y # CONFIG_PPC_64K_PAGES is not set CONFIG_SCHED_SMT=y CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0" -# CONFIG_PPC_INDIRECT_PCI is not set CONFIG_KERNEL_START=0xc000000000000000 -CONFIG_KEYS_COMPAT=y ## ## file: arch/powerpc/Kconfig.debug @@ -35,22 +23,14 @@ ## ## file: arch/powerpc/platforms/Kconfig ## -CONFIG_XICS=y -CONFIG_MPIC=y -CONFIG_U3_DART=y -CONFIG_PPC_RTAS=y -CONFIG_RTAS_ERROR_LOGGING=y CONFIG_RTAS_PROC=y CONFIG_RTAS_FLASH=m -CONFIG_MMIO_NVRAM=y # CONFIG_IBMEBUS is not set -# CONFIG_PPC_MPC106 is not set CONFIG_CPU_FREQ_PMAC64=y ## ## file: arch/powerpc/platforms/cell/Kconfig ## -CONFIG_PPC_CELL=y # CONFIG_PPC_IBM_CELL_BLADE is not set CONFIG_SPU_FS=m @@ -64,8 +44,6 @@ ## CONFIG_PPC64=y # CONFIG_POWER4_ONLY is not set -CONFIG_POWER3=y -CONFIG_POWER4=y # CONFIG_TUNE_CELL is not set CONFIG_ALTIVEC=y CONFIG_VIRT_CPU_ACCOUNTING=y @@ -172,28 +150,14 @@ CONFIG_WATCHDOG_RTAS=m ## -## file: init/Kconfig -## -CONFIG_LOCK_KERNEL=y -CONFIG_STOP_MACHINE=y - -## ## file: mm/Kconfig ## -CONFIG_SELECT_MEMORY_MODEL=y ## choice: Memory model # CONFIG_FLATMEM_MANUAL is not set # CONFIG_DISCONTIGMEM_MANUAL is not set CONFIG_SPARSEMEM_MANUAL=y ## end choice -CONFIG_DISCONTIGMEM=y -CONFIG_SPARSEMEM=y -CONFIG_NEED_MULTIPLE_NODES=y -CONFIG_HAVE_MEMORY_PRESENT=y -# CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPARSEMEM_EXTREME=y # CONFIG_MEMORY_HOTPLUG is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 CONFIG_MIGRATION=y ## Modified: dists/trunk/linux-2.6/debian/config/s390/config ============================================================================== --- dists/trunk/linux-2.6/debian/config/s390/config (original) +++ dists/trunk/linux-2.6/debian/config/s390/config Fri Mar 14 12:03:09 2008 @@ -73,8 +73,6 @@ # CONFIG_PPP is not set # CONFIG_SLIP is not set # CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set ## ## file: drivers/net/appletalk/Kconfig @@ -234,7 +232,6 @@ ## ## file: net/llc/Kconfig ## -CONFIG_LLC=y # CONFIG_LLC2 is not set ## _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes