[kernel] r10853 - dists/trunk/linux-2.6/debian/config/amd64
Bastian Blank
waldi at alioth.debian.org
Fri Mar 14 13:32:31 UTC 2008
Author: waldi
Date: Fri Mar 14 13:32:29 2008
New Revision: 10853
Log:
debian/config/amd64: Remove silent options.
Modified:
dists/trunk/linux-2.6/debian/config/amd64/config
dists/trunk/linux-2.6/debian/config/amd64/config.amd64
Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config Fri Mar 14 13:32:29 2008
@@ -8,28 +8,6 @@
## file: arch/x86/Kconfig
##
CONFIG_64BIT=y
-CONFIG_X86_64=y
-CONFIG_X86=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_SEMAPHORE_SLEEPERS=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_DMI=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_TIME_VSYSCALL=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_AUDIT_ARCH=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_HT=y
## choice: Subarchitecture Type
CONFIG_X86_PC=y
# CONFIG_X86_VSMP is not set
@@ -37,22 +15,16 @@
CONFIG_PARAVIRT_GUEST=y
CONFIG_PARAVIRT=y
CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
CONFIG_CALGARY_IOMMU=y
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_SWIOTLB=y
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
CONFIG_I8K=m
CONFIG_MICROCODE=m
-CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_MTRR=y
CONFIG_EFI=y
# CONFIG_CC_STACKPROTECTOR is not set
@@ -61,19 +33,11 @@
# CONFIG_RELOCATABLE is not set
CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_HOTPLUG_CPU=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_DMAR is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_K8_NB=y
CONFIG_IA32_EMULATION=y
CONFIG_IA32_AOUT=y
-CONFIG_COMPAT=y
-CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
-CONFIG_SYSVIPC_COMPAT=y
##
## file: arch/x86/Kconfig.cpu
@@ -81,10 +45,6 @@
## choice: Processor family
# CONFIG_MCORE2 is not set
## end choice
-CONFIG_X86_INTERNODE_CACHE_BYTES=128
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_TSC=y
##
## file: arch/x86/Kconfig.debug
@@ -106,7 +66,6 @@
CONFIG_X86_SPEEDSTEP_CENTRINO=m
# CONFIG_X86_P4_CLOCKMOD is not set
# CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set
-# CONFIG_X86_SPEEDSTEP_LIB is not set
##
## file: arch/x86/kvm/Kconfig
@@ -124,15 +83,9 @@
CONFIG_CRYPTO_SALSA20_X86_64=m
##
-## file: crypto/async_tx/Kconfig
-##
-CONFIG_ASYNC_CORE=m
-
-##
## 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
@@ -151,9 +104,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_HOTPLUG_MEMORY=m
@@ -174,7 +124,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
@@ -184,7 +133,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
@@ -262,7 +210,6 @@
##
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_NONSTANDARD=y
CONFIG_ROCKETPORT=m
CONFIG_CYCLADES=m
@@ -281,7 +228,6 @@
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
-CONFIG_VIRTIO_CONSOLE=y
CONFIG_NVRAM=m
CONFIG_RTC=y
CONFIG_GEN_RTC=m
@@ -347,7 +293,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
@@ -510,13 +455,11 @@
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
CONFIG_BLK_DEV_IDEPNP=y
-CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_IDEPCI_PCIBUS_ORDER is not set
# 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
@@ -542,8 +485,6 @@
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_BLK_DEV_HD is not set
##
## file: drivers/input/Kconfig
@@ -678,7 +619,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
##
@@ -742,7 +682,6 @@
CONFIG_HISAX_HFCUSB=m
CONFIG_HISAX_HFC4S8S=m
CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_HISAX_HDLC=y
##
## file: drivers/isdn/i4l/Kconfig
@@ -769,21 +708,6 @@
CONFIG_MAC_EMUMOUSEBTN=y
##
-## file: drivers/media/Kconfig
-##
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR_I2C=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
@@ -879,7 +803,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
@@ -894,7 +817,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
@@ -914,8 +836,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
@@ -945,7 +865,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
@@ -1023,9 +942,7 @@
# CONFIG_SLIP_MODE_SLIP6 is not set
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
##
@@ -1156,7 +1073,6 @@
##
## file: drivers/pci/Kconfig
##
-CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
CONFIG_HT_IRQ=y
@@ -1194,7 +1110,6 @@
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_TCIC=m
-CONFIG_PCCARD_NONSTATIC=m
##
## file: drivers/pnp/Kconfig
@@ -1203,11 +1118,6 @@
CONFIG_PNP_DEBUG=y
##
-## file: drivers/pnp/pnpacpi/Kconfig
-##
-CONFIG_PNPACPI=y
-
-##
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_ARCMSR=m
@@ -1265,7 +1175,6 @@
##
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
CONFIG_SERIAL_8250_CS=m
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -1274,8 +1183,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
##
@@ -1288,8 +1195,6 @@
##
## file: drivers/usb/Kconfig
##
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB=y
CONFIG_USB_USS720=m
@@ -1327,7 +1232,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
@@ -1345,9 +1249,6 @@
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_OHCI_HCD=m
# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_SL811_HCD=m
CONFIG_USB_SL811_CS=m
@@ -1396,15 +1297,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
@@ -1469,7 +1361,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
@@ -1488,8 +1379,6 @@
##
## file: drivers/virtio/Kconfig
##
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_BALLOON=m
@@ -1560,7 +1449,6 @@
CONFIG_HOTPLUG=y
CONFIG_BASE_FULL=y
CONFIG_PROFILING=y
-CONFIG_BASE_SMALL=0
##
## file: kernel/Kconfig.hz
@@ -1575,8 +1463,6 @@
CONFIG_PM=y
CONFIG_PM_LEGACY=y
# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
CONFIG_SUSPEND=y
CONFIG_HIBERNATION=y
CONFIG_PM_STD_PARTITION=""
@@ -1592,11 +1478,6 @@
##
CONFIG_CRC_CCITT=m
CONFIG_CRC32=y
-CONFIG_REED_SOLOMON=m
-CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
##
## file: lib/Kconfig.debug
@@ -1618,12 +1499,7 @@
##
## file: mm/Kconfig
##
-CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_RESOURCES_64BIT=y
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_NR_QUICK=2
-CONFIG_VIRT_TO_BUS=y
##
## file: net/atm/Kconfig
@@ -1731,7 +1607,6 @@
##
## file: net/llc/Kconfig
##
-CONFIG_LLC=y
CONFIG_LLC2=m
##
@@ -1761,12 +1636,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
@@ -1777,10 +1648,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=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_MTPAV=m
@@ -1844,7 +1711,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/amd64/config.amd64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config.amd64 (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config.amd64 Fri Mar 14 13:32:29 2008
@@ -8,9 +8,6 @@
CONFIG_K8_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y
# CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
##
## file: arch/x86/Kconfig.cpu
@@ -20,13 +17,10 @@
# CONFIG_MPSC is not set
CONFIG_GENERIC_CPU=y
## end choice
-CONFIG_X86_L1_CACHE_BYTES=128
-CONFIG_X86_L1_CACHE_SHIFT=7
##
## file: drivers/acpi/Kconfig
##
-CONFIG_ACPI_HOTPLUG_CPU=y
CONFIG_ACPI_NUMA=y
##
@@ -51,17 +45,6 @@
CONFIG_FB_MATROX_MAVEN=m
##
-## file: fs/Kconfig
-##
-CONFIG_FS_MBCACHE=m
-
-##
-## file: init/Kconfig
-##
-CONFIG_LOCK_KERNEL=y
-CONFIG_STOP_MACHINE=y
-
-##
## file: mm/Kconfig
##
## choice: Memory model
@@ -69,8 +52,5 @@
CONFIG_DISCONTIGMEM_MANUAL=y
# CONFIG_SPARSEMEM_MANUAL is not set
## end choice
-CONFIG_DISCONTIGMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_MIGRATION=y
More information about the Kernel-svn-changes
mailing list