Author: maks Date: Wed Dec 5 17:35:09 2007 New Revision: 9902 Log: topconfig reorder bunch of variables
Modified: dists/trunk/linux-2.6/debian/config/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 Wed Dec 5 17:35:09 2007 @@ -1,7 +1,10 @@ # # Debian toplevel config # +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y CONFIG_GENERIC_BUG=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set # # General setup @@ -11,6 +14,7 @@ # 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 @@ -43,6 +47,7 @@ CONFIG_SIGNALFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set @@ -603,6 +608,10 @@ CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_MISC_DEVICES=y +CONFIG_ASUS_LAPTOP=m +CONFIG_FUJITSU_LAPTOP=m +CONFIG_MSI_LAPTOP=m +CONFIG_SONY_LAPTOP=m # # Please see Documentation/ide.txt for help/info on IDE drives @@ -833,6 +842,7 @@ CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y CONFIG_ULI526X=m +# CONFIG_FORCEDETH_NAPI is not set CONFIG_VIA_RHINE_NAPI=y CONFIG_SC92031=m CONFIG_NETDEV_1000=y @@ -1213,6 +1223,10 @@ CONFIG_W1_SLAVE_DS2433=m # CONFIG_W1_SLAVE_DS2433_CRC is not set CONFIG_W1_SLAVE_DS2760=m +CONFIG_POWER_SUPPLY=m +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_BATTERY_DS2760=m CONFIG_HWMON=y CONFIG_HWMON_VID=m CONFIG_SENSORS_ABITUGURU=m @@ -1503,6 +1517,12 @@ CONFIG_FB_PM3=m CONFIG_FB_SM501=m +# CONFIG_MMC_UNSAFE_RESUME is not set +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK_BOUNCE=y + # # MMC/SD Host Controller Drivers # @@ -1528,6 +1548,7 @@ CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y CONFIG_INFINIBAND_ADDR_TRANS=y CONFIG_INFINIBAND_MTHCA=m CONFIG_INFINIBAND_MTHCA_DEBUG=y @@ -1584,8 +1605,10 @@ # CONFIG_RTC_DRV_CMOS=m CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_STK17TA8=m CONFIG_RTC_DRV_DS1742=m CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T59=m CONFIG_RTC_DRV_V3020=m CONFIG_USB_XUSBATM=m @@ -1675,13 +1698,11 @@ # CONFIG_SLOB is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_OCFS2_FS=m -CONFIG_SLAB=y CONFIG_USB_ET61X251=m CONFIG_AMD8111E_NAPI=y CONFIG_R8169_NAPI=y CONFIG_ADAPTEC_STARFIRE_NAPI=y # CONFIG_GIGASET_UNDOCREQ is not set -# CONFIG_MMC_UNSAFE_RESUME is not set CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_RTC_LIB=m CONFIG_GIGASET_BASE=m @@ -1804,6 +1825,7 @@ # Pseudo filesystems # CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_HUGETLBFS=y @@ -1933,7 +1955,6 @@ CONFIG_HW_RANDOM=y CONFIG_SND_MIA=m CONFIG_MCS_FIR=m -CONFIG_STACKTRACE_SUPPORT=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set CONFIG_SND_INDIGODJ=m CONFIG_SND_ECHO3G=m @@ -1956,13 +1977,8 @@ CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 CONFIG_SSFDC=m -CONFIG_ASUS_LAPTOP=m -CONFIG_FUJITSU_LAPTOP=m -CONFIG_MSI_LAPTOP=m -CONFIG_SONY_LAPTOP=m CONFIG_FIB_RULES=y CONFIG_TIFM_7XX1=m -CONFIG_PROC_SYSCTL=y CONFIG_USB_STORAGE_KARMA=y # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set CONFIG_W83697HF_WDT=m @@ -1972,34 +1988,23 @@ CONFIG_USB_MIDI_GADGET=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_PC87413_WDT=m -# CONFIG_ARCH_HAS_ILOG2_U32 is not set CONFIG_HID=m # CONFIG_HID_DEBUG is not set CONFIG_MOXA_SMARTIO_NEW=m CONFIG_AC97_BUS=m # CONFIG_ITCO_VENDOR_SUPPORT is not set CONFIG_WAN_ROUTER_DRIVERS=m -# CONFIG_FORCEDETH_NAPI is not set -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_BATTERY_DS2760=m # CONFIG_SND_SOC is not set CONFIG_SND_SB_COMMON=m -# CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FS is not set # CONFIG_3C359 is not set # CONFIG_USB_EMI62 is not set CONFIG_USB_DEVICE_CLASS=y -CONFIG_LOCKDEP_SUPPORT=y # CONFIG_FUSION_LOGGING is not set CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_SYSVIPC_SYSCTL=y # CONFIG_USB_GADGET_S3C2410 is not set -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_POWER_SUPPLY=m # CONFIG_USB_GADGET_M66592 is not set -CONFIG_VM_EVENT_COUNTERS=y CONFIG_VGASTATE=m # CONFIG_RELOCATABLE is not set # CONFIG_USB_PERSIST is not set @@ -2008,7 +2013,6 @@ CONFIG_DAB=y # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set # CONFIG_USB_GADGET_FSL_USB2 is not set -CONFIG_RTC_DRV_M48T59=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_EDAC_I82975X=m CONFIG_SND_SB16_DSP=m @@ -2024,7 +2028,6 @@ CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_POWER_SAVE=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 -CONFIG_PDA_POWER=m # CONFIG_AUXDISPLAY is not set CONFIG_MTD_NAND_CS553X=m CONFIG_USB_R8A66597_HCD=m _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
