Author: waldi Date: Fri Mar 14 13:31:10 2008 New Revision: 10852 Log: debian/config/i386: Remove silent options.
Modified: dists/trunk/linux-2.6/debian/config/i386/config dists/trunk/linux-2.6/debian/config/i386/config.486 dists/trunk/linux-2.6/debian/config/i386/config.686 dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem Modified: dists/trunk/linux-2.6/debian/config/i386/config ============================================================================== --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Fri Mar 14 13:31:10 2008 @@ -7,20 +7,6 @@ ## ## file: arch/x86/Kconfig ## -CONFIG_X86_32=y -CONFIG_X86=y -CONFIG_GENERIC_TIME=y -CONFIG_SEMAPHORE_SLEEPERS=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_DMI=y -# CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_BIOS_REBOOT=y -CONFIG_KTIME_SCALAR=y ## choice: Subarchitecture Type CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set @@ -36,17 +22,13 @@ CONFIG_VMI=y CONFIG_PARAVIRT=y CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y CONFIG_VM86=y CONFIG_TOSHIBA=m CONFIG_I8K=m # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_MICROCODE=m -CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m ## choice: High Memory Support @@ -58,11 +40,7 @@ # CONFIG_VMSPLIT_2G is not set # CONFIG_VMSPLIT_1G is not set ## end choice -CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_X86_PAE is not set -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_MTRR=y CONFIG_EFI=y # CONFIG_IRQBALANCE is not set @@ -86,15 +64,11 @@ # CONFIG_PCI_GODIRECT is not set CONFIG_PCI_GOANY=y ## end choice -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y # CONFIG_DMAR is not set -CONFIG_ISA_DMA_API=y CONFIG_ISA=y CONFIG_SCx200=m CONFIG_SCx200HR_TIMER=m -CONFIG_K8_NB=y ## ## file: arch/x86/Kconfig.cpu @@ -129,8 +103,6 @@ # CONFIG_DEBUG_RODATA is not set # CONFIG_DEBUG_NX_TEST is not set # CONFIG_4KSTACKS is not set -CONFIG_X86_FIND_SMP_CONFIG=y -CONFIG_X86_MPPARSE=y CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_BOOT_PARAMS is not set # CONFIG_CPA_DEBUG is not set @@ -141,7 +113,6 @@ CONFIG_X86_ACPI_CPUFREQ=m CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y CONFIG_X86_POWERNOW_K8=m CONFIG_X86_POWERNOW_K8_ACPI=y CONFIG_X86_GX_SUSPMOD=m @@ -155,7 +126,6 @@ CONFIG_X86_LONGHAUL=m CONFIG_X86_E_POWERSAVER=m # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set -CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y ## @@ -187,7 +157,6 @@ ## file: drivers/acpi/Kconfig ## CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_SYSFS_POWER=y @@ -206,9 +175,6 @@ CONFIG_ACPI_CUSTOM_DSDT_INITRD=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_EC=y -CONFIG_ACPI_POWER=y -CONFIG_ACPI_SYSTEM=y CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m @@ -237,7 +203,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 @@ -249,7 +214,6 @@ # CONFIG_ATM_FORE200E_USE_TASKLET is not set CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_FORE200E=m CONFIG_ATM_HE=m CONFIG_ATM_HE_USE_SUNI=y @@ -331,7 +295,6 @@ ## CONFIG_VT=y CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y CONFIG_SERIAL_NONSTANDARD=y CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m @@ -348,7 +311,6 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m -CONFIG_VIRTIO_CONSOLE=y CONFIG_NVRAM=m CONFIG_RTC=m CONFIG_GEN_RTC=m @@ -424,7 +386,6 @@ ## file: drivers/cpufreq/Kconfig ## CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m # CONFIG_CPU_FREQ_DEBUG is not set CONFIG_CPU_FREQ_STAT=m ## choice: Default CPUFreq governor @@ -594,12 +555,10 @@ CONFIG_BLK_DEV_CMD640=y # CONFIG_BLK_DEV_CMD640_ENHANCED is not set CONFIG_BLK_DEV_IDEPNP=y -CONFIG_BLK_DEV_IDEPCI=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=m CONFIG_BLK_DEV_OPTI621=m CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_BLK_DEV_AEC62XX=m CONFIG_BLK_DEV_ALI15X3=m # CONFIG_WDC_ALI15X3 is not set @@ -632,8 +591,6 @@ # CONFIG_BLK_DEV_HT6560B is not set # CONFIG_BLK_DEV_QD65XX is not set # CONFIG_BLK_DEV_UMC8672 is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_BLK_DEV_HD is not set ## ## file: drivers/input/Kconfig @@ -774,7 +731,6 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_CAPI20=m CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m CONFIG_ISDN_CAPI_CAPIDRV=m ## @@ -850,7 +806,6 @@ CONFIG_HISAX_HFCUSB=m CONFIG_HISAX_HFC4S8S=m CONFIG_HISAX_FRITZ_PCIPNP=m -CONFIG_HISAX_HDLC=y ## ## file: drivers/isdn/i4l/Kconfig @@ -897,20 +852,6 @@ # CONFIG_MACINTOSH_DRIVERS is not set ## -## 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 @@ -1018,7 +959,6 @@ ## CONFIG_MTD_CFI=m CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m # CONFIG_MTD_CFI_ADV_OPTIONS is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_2=y @@ -1033,7 +973,6 @@ CONFIG_MTD_CFI_INTELEXT=m CONFIG_MTD_CFI_AMDSTD=m CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m CONFIG_MTD_RAM=m CONFIG_MTD_ROM=m CONFIG_MTD_ABSENT=m @@ -1053,8 +992,6 @@ CONFIG_MTD_DOC2000=m CONFIG_MTD_DOC2001=m CONFIG_MTD_DOC2001PLUS=m -CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m # CONFIG_MTD_DOCPROBE_ADVANCED is not set CONFIG_MTD_DOCPROBE_ADDRESS=0 @@ -1087,7 +1024,6 @@ ## CONFIG_MTD_NAND=m # CONFIG_MTD_NAND_VERIFY_WRITE is not set -CONFIG_MTD_NAND_IDS=m CONFIG_MTD_NAND_DISKONCHIP=m # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 @@ -1198,9 +1134,7 @@ CONFIG_SLIP_MODE_SLIP6=y CONFIG_NET_FC=y CONFIG_NETCONSOLE=m -CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y CONFIG_VIRTIO_NET=m ## @@ -1389,7 +1323,6 @@ CONFIG_I82092=m CONFIG_I82365=m CONFIG_TCIC=m -CONFIG_PCCARD_NONSTATIC=m ## ## file: drivers/pnp/Kconfig @@ -1403,11 +1336,6 @@ CONFIG_ISAPNP=y ## -## file: drivers/pnp/pnpacpi/Kconfig -## -CONFIG_PNPACPI=y - -## ## file: drivers/pnp/pnpbios/Kconfig ## CONFIG_PNPBIOS=y @@ -1500,8 +1428,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set CONFIG_SERIAL_8250_RSA=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m ## @@ -1514,8 +1440,6 @@ ## ## file: drivers/usb/Kconfig ## -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB=m CONFIG_USB_USS720=m @@ -1553,7 +1477,6 @@ # 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 @@ -1571,7 +1494,6 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_OHCI_HCD=m # CONFIG_USB_OHCI_HCD_SSB is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_UHCI_HCD=m CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m @@ -1620,15 +1542,6 @@ ## CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m -# CONFIG_FB_MACMODES is not set -CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y CONFIG_FB_CIRRUS=m @@ -1699,7 +1612,6 @@ ## CONFIG_VGA_CONSOLE=y CONFIG_MDA_CONSOLE=m -CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y @@ -1722,8 +1634,6 @@ ## ## file: drivers/virtio/Kconfig ## -CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m @@ -1829,8 +1739,6 @@ ## CONFIG_CRC_CCITT=m CONFIG_CRC32=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_DEC16=y ## ## file: lib/Kconfig.debug @@ -1857,8 +1765,6 @@ # CONFIG_DISCONTIGMEM_MANUAL is not set # CONFIG_SPARSEMEM_MANUAL is not set ## end choice -CONFIG_SPARSEMEM_STATIC=y -CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_RESOURCES_64BIT is not set ## @@ -1967,7 +1873,6 @@ ## ## file: net/llc/Kconfig ## -CONFIG_LLC=y CONFIG_LLC2=m ## @@ -1997,12 +1902,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=m -CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_SEQUENCER_OSS=y @@ -2013,11 +1914,6 @@ ## ## file: sound/drivers/Kconfig ## -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL4_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m CONFIG_SND_DUMMY=m CONFIG_SND_VIRMIDI=m CONFIG_SND_MTPAV=m @@ -2027,8 +1923,6 @@ ## ## file: sound/isa/Kconfig ## -CONFIG_SND_AD1848_LIB=m -CONFIG_SND_CS4231_LIB=m CONFIG_SND_ADLIB=m CONFIG_SND_AD1816A=m CONFIG_SND_AD1848=m @@ -2043,7 +1937,6 @@ CONFIG_SND_ES1688=m CONFIG_SND_ES18XX=m CONFIG_SND_SC6000=m -CONFIG_SND_GUS_SYNTH=m CONFIG_SND_GUSCLASSIC=m CONFIG_SND_GUSEXTREME=m CONFIG_SND_GUSMAX=m @@ -2120,7 +2013,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/i386/config.486 ============================================================================== --- dists/trunk/linux-2.6/debian/config/i386/config.486 (original) +++ dists/trunk/linux-2.6/debian/config/i386/config.486 Fri Mar 14 13:31:10 2008 @@ -1,8 +1,6 @@ ## ## file: arch/x86/Kconfig ## -CONFIG_RWSEM_GENERIC_SPINLOCK=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y # CONFIG_SMP is not set CONFIG_X86_UP_APIC=y CONFIG_X86_UP_IOAPIC=y @@ -25,17 +23,7 @@ # CONFIG_MK7 is not set ## end choice CONFIG_X86_GENERIC=y -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=7 -CONFIG_X86_XADD=y CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_F00F_BUG=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_INTEL_USERCOPY=y ## ## file: drivers/block/Kconfig @@ -150,11 +138,9 @@ ## file: fs/Kconfig ## CONFIG_EXT2_FS=y -CONFIG_FS_MBCACHE=y ## ## file: init/Kconfig ## -CONFIG_BROKEN_ON_SMP=y CONFIG_LOG_BUF_SHIFT=14 Modified: dists/trunk/linux-2.6/debian/config/i386/config.686 ============================================================================== --- dists/trunk/linux-2.6/debian/config/i386/config.686 (original) +++ dists/trunk/linux-2.6/debian/config/i386/config.686 Fri Mar 14 13:31:10 2008 @@ -1,10 +1,6 @@ ## ## file: arch/x86/Kconfig ## -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_X86_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_X86_MCE=y @@ -14,10 +10,8 @@ # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y ## end choice -CONFIG_HIGHMEM=y # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # CONFIG_EISA is not set # CONFIG_MCA is not set @@ -31,22 +25,7 @@ # CONFIG_MK7 is not set ## end choice # CONFIG_X86_GENERIC is not set -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=5 -CONFIG_X86_XADD=y CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_GOOD_APIC=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y - -## -## file: drivers/acpi/Kconfig -## -CONFIG_ACPI_HOTPLUG_CPU=y ## ## file: drivers/char/Kconfig @@ -104,16 +83,9 @@ # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set ## -## file: fs/Kconfig -## -CONFIG_FS_MBCACHE=m - -## ## file: init/Kconfig ## -CONFIG_LOCK_KERNEL=y CONFIG_LOG_BUF_SHIFT=15 -CONFIG_STOP_MACHINE=y ## ## file: lib/Kconfig.debug Modified: dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem ============================================================================== --- dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem (original) +++ dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem Fri Mar 14 13:31:10 2008 @@ -1,10 +1,6 @@ ## ## file: arch/x86/Kconfig ## -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_X86_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y CONFIG_SMP=y CONFIG_NR_CPUS=32 CONFIG_X86_MCE=y @@ -15,7 +11,6 @@ # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y ## end choice -CONFIG_HIGHMEM=y CONFIG_X86_PAE=y # CONFIG_HIGHPTE is not set # CONFIG_MATH_EMULATION is not set @@ -32,17 +27,7 @@ # CONFIG_MK7 is not set ## end choice # CONFIG_X86_GENERIC is not set -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=5 -CONFIG_X86_XADD=y CONFIG_X86_PPRO_FENCE=y -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_GOOD_APIC=y -CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y ## ## file: drivers/char/Kconfig @@ -101,16 +86,9 @@ # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set ## -## file: fs/Kconfig -## -CONFIG_FS_MBCACHE=m - -## ## file: init/Kconfig ## -CONFIG_LOCK_KERNEL=y CONFIG_LOG_BUF_SHIFT=15 -CONFIG_STOP_MACHINE=y ## ## file: lib/Kconfig.debug _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes