================================
kernel:source=2.6.13-0.0.2 (previous: 2.6.13-0.0.1)
cvc rdiff kernel -1 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.2
================================
2.6.13-0.0.2 xiaowen ([EMAIL PROTECTED]) Sun Sep 25 04:37:29 2005
From ck1 to archck6.1. This works for me if I build as x86_64--no more awk
segfaults.
kernel.recipe: changed
Index: kernel.recipe
====================================================================
contents(size sha1)
inode(mtime group)
--- kernel.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.1
+++ kernel.recipe /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.2
@@ -2,9 +2,8 @@
# Copyright (c) 2004-2005 rpath, Inc.
# All rights reserved
#
-# bootsplash testing lines - search for GIL
-
-class Kernel(PackageRecipe):
+
+class Kernel(CPackageRecipe):
buildRequires = [ 'perl:runtime', 'module-init-tools:runtime',
'glibc:devel' ]
@@ -12,7 +11,7 @@
version = '2.6.13'
serial = 'fdl.devel.1'
- ckversion = '1'
+ archckversion = '6.1'
# Every change that is expected to change interfaces requires
# a change in serial string. No two kernels of the same flavor
@@ -77,6 +76,8 @@
)
def setup(r):
+ # Disable Autodoc. Users tend to have more than 1 kernel installed
+ del r.AutoDoc
r.unpack()
r.configure()
r.build()
@@ -84,8 +85,8 @@
def unpack(r):
r.macros.majorversion = ".".join(r.version.split('.')[0:2])
r.macros.sublevel = r.version.split('.')[2]
- r.macros.serial = "ck%s-%s" % (r.ckversion, r.serial)
- r.macros.ckversion = r.ckversion
+ r.macros.serial = "archck%s-%s" % (r.archckversion, r.serial)
+ r.macros.archckversion = r.archckversion
r.mainDir('linux-%(version)s')
# r.macros.cfgver is set while creating configurations
# (ah, the wonders of delayed evaluation!)
@@ -119,11 +120,10 @@
# The inotify patch appears to be included in 2.6.13.
- # Bootsplash patch.
- r.addPatch('bootsplash-3.1.6-2.6.12.diff')
-
- # -ck patch.
-
r.addPatch('http://ck.kolivas.org/patches/%(majorversion)s/%(version)s/%(version)s-ck%(ckversion)s/patch-%(version)s-ck%(ckversion)s.bz2')
+ # Bootsplash patch replaced by fbsplash included in -archck
+
+ # -archck patch.
+
r.addPatch('http://iphitus.loudas.com/arch/ck/%(version)s/patch-%(version)s-archck%(archckversion)s.bz2')
# Red Hat's nonint_oldconfig to avoid requests for interactive response
r.addPatch('linux-2.4.0-nonintconfig.patch')
@@ -171,7 +171,7 @@
r.ComponentSpec('debuginfo', '%(debugsrcdir)s/', '%(debuglibdir)s/')
r.ComponentSpec('runtime', '.*')
# do not depend on mkinitrd's kernel tagdescription file
- r.TagSpec('fdl-kernel', '/boot/vmlinuz-.*', '/lib/modules/.*/.*\.k?o$')
+ r.TagSpec('kernel', '/boot/vmlinuz-.*', '/lib/modules/.*/.*\.k?o$')
if Arch.x86:
r.Provides('abi: ELF32(SysV x86)', '/boot/vmlinu.*')
if Arch.x86_64:
patch-2.6.13-archck6.1.bz2: new
config.x86_64: changed
Index: config.x86_64
====================================================================
contents(size sha1)
inode(mtime group)
--- config.x86_64 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.1
+++ config.x86_64 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.2
@@ -1,5 +1,6 @@
CONFIG_X86_64=y
CONFIG_64BIT=y
+CONFIG_MK8=y
CONFIG_ACPI_SLEEP=y
CONFIG_APM_CPU_IDLE=n
CONFIG_APM_RTC_IS_GMT=n
@@ -24,3 +25,4 @@
CONFIG_SWIOTLB=y
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
+CONFIG_FB_VESA_STD=y
config.x86: changed
Index: config.x86
====================================================================
contents(size sha1)
inode(mtime group)
--- config.x86 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.1
+++ config.x86 /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.2
@@ -35,7 +35,7 @@
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_WP_WORKS_OK=n
+CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
@@ -44,8 +44,6 @@
CONFIG_X86_USE_PPRO_CHECKSUM=n
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
-CONFIG_PREEMPT=n
-CONFIG_X86_UP_APIC=n
CONFIG_X86_MCE=y
CONFIG_X86_MCE_NONFATAL=n
CONFIG_TOSHIBA=m
linux-2.6.13.tar.bz2: changed
Index: linux-2.6.13.tar.bz2
====================================================================
inode(perms owner group)
config.base: changed
Index: config.base
====================================================================
contents(size sha1)
inode(mtime group)
--- config.base /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.1
+++ config.base /[EMAIL PROTECTED]:devel//[EMAIL
PROTECTED]:desktop//devel/2.6.13-0.0.2
@@ -1,10 +1,5 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-ck1-fdl.devel.1.smp.x86.i686.cmov
-# Mon Aug 29 20:26:16 2005
-#
-CONFIG_X86_64=y
-CONFIG_64BIT=y
+CONFIG_X86_64=n
+CONFIG_64BIT=n
CONFIG_X86=y
CONFIG_MMU=y
CONFIG_IA32_EMULATION=y
@@ -27,6 +22,7 @@
#
CONFIG_LOCALVERSION=""
CONFIG_SWAP=y
+CONFIG_SWAP_PREFETCH=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
@@ -36,7 +32,8 @@
CONFIG_AUDITSYSCALL=y
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
-CONFIG_IKCONFIG=n
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
CONFIG_CPUSETS=y
CONFIG_EMBEDDED=n
CONFIG_KALLSYMS=y
@@ -84,7 +81,7 @@
CONFIG_M586=n
CONFIG_M586TSC=n
CONFIG_M586MMX=n
-CONFIG_M686=y
+CONFIG_M686=n
CONFIG_MPENTIUMII=n
CONFIG_MPENTIUMIII=n
CONFIG_MPENTIUMM=n
@@ -101,31 +98,31 @@
CONFIG_MCYRIXIII=n
CONFIG_MVIAC3_2=n
CONFIG_X86_GENERIC=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
+CONFIG_X86_CMPXCHG=n
+CONFIG_X86_XADD=n
CONFIG_X86_L1_CACHE_SHIFT=7
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=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_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_PPRO_FENCE=n
+CONFIG_X86_WP_WORKS_OK=n
+CONFIG_X86_INVLPG=n
+CONFIG_X86_BSWAP=n
+CONFIG_X86_POPAD_OK=n
+CONFIG_X86_GOOD_APIC=n
+CONFIG_X86_INTEL_USERCOPY=n
+CONFIG_X86_USE_PPRO_CHECKSUM=n
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_GART_IOMMU=y
CONFIG_SWIOTLB=y
CONFIG_GENERIC_CPU=y
-CONFIG_SMP=y
+CONFIG_SMP=n
CONFIG_NR_CPUS=32
-CONFIG_SCHED_SMT=y
+CONFIG_SCHED_SMT=n
CONFIG_X86_UP_APIC=y
-CONFIG_PREEMPT_NONE=y
-CONFIG_PREEMPT_VOLUNTARY=n
-CONFIG_PREEMPT=n
+CONFIG_PREEMPT_NONE=n
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT=y
CONFIG_PREEMPT_BKL=y
CONFIG_K8_NUMA=y
CONFIG_NUMA_EMU=n
@@ -133,7 +130,7 @@
CONFIG_X86_IO_APIC=y
CONFIG_X86_TSC=y
CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=n
+CONFIG_X86_MCE_NONFATAL=m
CONFIG_X86_MCE_P4THERMAL=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
@@ -147,8 +144,8 @@
#
CONFIG_EDD=m
CONFIG_NOHIGHMEM=n
-CONFIG_HIGHMEM4G=n
-CONFIG_HIGHMEM64G=y
+CONFIG_HIGHMEM4G=y
+CONFIG_HIGHMEM64G=n
CONFIG_HIGHMEM=y
CONFIG_X86_PAE=y
CONFIG_SELECT_MEMORY_MODEL=y
@@ -178,7 +175,21 @@
#
CONFIG_PM=y
CONFIG_PM_DEBUG=n
-CONFIG_SOFTWARE_SUSPEND=n
+CONFIG_SOFTWARE_SUSPEND=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_SUSPEND2=y
+
+#
+# Image Storage (you need at least one writer)
+#
+CONFIG_SUSPEND2_FILEWRITER=y
+CONFIG_SUSPEND2_SWAPWRITER=y
+
+#
+# General Options
+#
+CONFIG_SUSPEND2_DEFAULT_RESUME2=""
+CONFIG_SUSPEND2_KEEP_IMAGE=n
#
# ACPI (Advanced Configuration and Power Interface) Support
@@ -191,14 +202,15 @@
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=n
+CONFIG_ACPI_HOTKEY=m
CONFIG_ACPI_FAN=y
CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_NUMA=n
CONFIG_ACPI_ASUS=m
CONFIG_ACPI_IBM=m
CONFIG_ACPI_TOSHIBA=m
+CONFIG_ACPI_CUSTOM_DSDT_INITRD=y
CONFIG_ACPI_BLACKLIST_YEAR=2001
CONFIG_ACPI_DEBUG=n
CONFIG_ACPI_BUS=y
@@ -207,7 +219,7 @@
CONFIG_ACPI_PCI=y
CONFIG_ACPI_SYSTEM=y
CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=n
+CONFIG_ACPI_CONTAINER=m
#
# APM (Advanced Power Management) BIOS Support
@@ -225,10 +237,10 @@
# CPU Frequency scaling
#
CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_TABLE=m
CONFIG_CPU_FREQ_DEBUG=n
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_STAT_DETAILS=n
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=n
CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -242,27 +254,27 @@
#
CONFIG_X86_ACPI_CPUFREQ=m
CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=y
+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=n
-CONFIG_X86_SPEEDSTEP_CENTRINO=y
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y
CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=y
+CONFIG_X86_SPEEDSTEP_ICH=m
CONFIG_X86_SPEEDSTEP_SMI=m
CONFIG_X86_P4_CLOCKMOD=m
CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=y
-CONFIG_X86_LONGHAUL=n
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
#
# shared options
#
CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=n
-CONFIG_X86_SPEEDSTEP_LIB=y
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=n
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -281,7 +293,7 @@
CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE=y
CONFIG_PCI_MSI=y
CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=n
+CONFIG_PCI_NAMES=y
CONFIG_PCI_DEBUG=n
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
@@ -314,12 +326,13 @@
#
# PCI Hotplug Support
#
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_FAKE=n
+CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI_FAKE=m
CONFIG_HOTPLUG_PCI_COMPAQ=m
CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=n
CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=n
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=n
CONFIG_HOTPLUG_PCI_SHPC=m
CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y
@@ -328,7 +341,7 @@
# Executable file formats
#
CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_AOUT=n
+CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
CONFIG_IA32_EMULATION=y
CONFIG_IA32_AOUT=y
@@ -498,7 +511,7 @@
#
# IPv6: Netfilter Configuration (EXPERIMENTAL)
#
-CONFIG_IP6_NF_QUEUE=n
+CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
CONFIG_IP6_NF_MATCH_LIMIT=m
CONFIG_IP6_NF_MATCH_MAC=m
@@ -553,12 +566,18 @@
CONFIG_SCTP_HMAC_NONE=n
CONFIG_SCTP_HMAC_SHA1=n
CONFIG_SCTP_HMAC_MD5=y
-CONFIG_ATM=n
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_CLIP_NO_ICMP=n
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_ATM_BR2684_IPFILTER=n
CONFIG_BRIDGE=m
CONFIG_VLAN_8021Q=m
CONFIG_DECNET=n
CONFIG_LLC=m
-CONFIG_LLC2=n
+CONFIG_LLC2=m
CONFIG_IPX=m
CONFIG_IPX_INTERN=n
CONFIG_ATALK=m
@@ -582,6 +601,7 @@
CONFIG_NET_SCH_CBQ=m
CONFIG_NET_SCH_HTB=m
CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
CONFIG_NET_SCH_PRIO=m
CONFIG_NET_SCH_RED=m
CONFIG_NET_SCH_SFQ=m
@@ -618,7 +638,7 @@
#
# Network testing
#
-CONFIG_NET_PKTGEN=n
+CONFIG_NET_PKTGEN=m
CONFIG_HAMRADIO=n
CONFIG_IRDA=m
@@ -674,12 +694,12 @@
CONFIG_USB_IRDA=m
CONFIG_SIGMATEL_FIR=m
CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=n
-CONFIG_TOSHIBA_FIR=n
-CONFIG_SMC_IRCC_FIR=n
-CONFIG_ALI_FIR=n
-CONFIG_VLSI_FIR=n
-CONFIG_VIA_FIR=n
+CONFIG_WINBOND_FIR=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
@@ -850,8 +870,9 @@
# Protocols
#
CONFIG_ISAPNP=y
-CONFIG_PNPBIOS=n
-CONFIG_PNPACPI=n
+CONFIG_PNPBIOS=y
+CONFIG_PNPBIOS_PROC_FS=n
+CONFIG_PNPACPI=y
#
# Block devices
@@ -905,15 +926,16 @@
CONFIG_BLK_DEV_IDECS=m
CONFIG_BLK_DEV_IDECD=y
CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=y
-CONFIG_BLK_DEV_IDESCSI=n
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_BLK_DEV_IDESCSI=m
CONFIG_IDE_TASK_IOCTL=n
#
# IDE chipset support/bugfixes
#
CONFIG_IDE_GENERIC=y
-CONFIG_BLK_DEV_CMD640=n
+CONFIG_BLK_DEV_CMD640=y
+CONFIG_BLK_DEV_CMD640_ENHANCED=y
CONFIG_BLK_DEV_IDEPNP=y
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
@@ -941,7 +963,7 @@
CONFIG_BLK_DEV_SC1200=n
CONFIG_BLK_DEV_PIIX=y
CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=n
+CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=y
CONFIG_PDC202XX_BURST=n
CONFIG_BLK_DEV_PDC202XX_NEW=y
@@ -950,7 +972,7 @@
CONFIG_BLK_DEV_SIIMAGE=y
CONFIG_BLK_DEV_SIS5513=y
CONFIG_BLK_DEV_SLC90E66=y
-CONFIG_BLK_DEV_TRM290=n
+CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=y
CONFIG_IDE_ARM=n
CONFIG_IDE_CHIPSETS=n
@@ -1005,7 +1027,7 @@
CONFIG_AIC7XXX_RESET_DELAY_MS=15000
CONFIG_AIC7XXX_DEBUG_ENABLE=n
CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=n
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
CONFIG_SCSI_AIC7XXX_OLD=m
CONFIG_SCSI_AIC79XX=m
CONFIG_AIC79XX_CMDS_PER_DEVICE=4
@@ -1013,7 +1035,7 @@
CONFIG_AIC79XX_ENABLE_RD_STRM=n
CONFIG_AIC79XX_DEBUG_ENABLE=n
CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=n
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
CONFIG_SCSI_DPT_I2O=n
CONFIG_SCSI_IN2000=m
CONFIG_MEGARAID_NEWGEN=y
@@ -1133,13 +1155,13 @@
#
CONFIG_IEEE1394_VERBOSEDEBUG=n
CONFIG_IEEE1394_OUI_DB=y
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=n
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
CONFIG_IEEE1394_EXPORT_FULL_API=n
#
# Device Drivers
#
-CONFIG_IEEE1394_PCILYNX=n
+CONFIG_IEEE1394_PCILYNX=m
CONFIG_IEEE1394_OHCI1394=m
#
@@ -1148,7 +1170,7 @@
CONFIG_IEEE1394_VIDEO1394=m
CONFIG_IEEE1394_SBP2=m
CONFIG_IEEE1394_SBP2_PHYS_DMA=n
-CONFIG_IEEE1394_ETH1394=n
+CONFIG_IEEE1394_ETH1394=m
CONFIG_IEEE1394_DV1394=m
CONFIG_IEEE1394_RAWIO=m
CONFIG_IEEE1394_CMP=m
@@ -1311,7 +1333,7 @@
#
# Wireless 802.11 Frequency Hopping cards support
#
-CONFIG_PCMCIA_RAYCS=n
+CONFIG_PCMCIA_RAYCS=m
#
# Wireless 802.11b ISA/PCI cards support
@@ -1389,6 +1411,40 @@
CONFIG_CYCLOMX_X25=y
CONFIG_SBNI=m
CONFIG_SBNI_MULTILINE=n
+
+#
+# ATM drivers
+#
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+CONFIG_ATM_ENI_DEBUG=n
+CONFIG_ATM_ENI_TUNE_BURST=n
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+CONFIG_ATM_ZATM_DEBUG=n
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=n
+CONFIG_ATM_NICSTAR_USE_IDT77105=n
+CONFIG_ATM_IDT77252=m
+CONFIG_ATM_IDT77252_DEBUG=n
+CONFIG_ATM_IDT77252_RCV_ALL=n
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+CONFIG_ATM_AMBASSADOR_DEBUG=n
+CONFIG_ATM_HORIZON=m
+CONFIG_ATM_HORIZON_DEBUG=n
+CONFIG_ATM_IA=m
+CONFIG_ATM_IA_DEBUG=n
+CONFIG_ATM_FORE200E_MAYBE=m
+CONFIG_ATM_FORE200E_PCA=y
+CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
+CONFIG_ATM_FORE200E_USE_TASKLET=n
+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
CONFIG_FDDI=y
CONFIG_DEFXX=m
CONFIG_SKFP=m
@@ -1400,14 +1456,15 @@
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=n
+CONFIG_PPP_BSDCOMP=m
CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
CONFIG_SLIP=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=n
CONFIG_SLIP_MODE_SLIP6=n
CONFIG_NET_FC=y
-CONFIG_SHAPER=n
+CONFIG_SHAPER=m
CONFIG_NETCONSOLE=m
CONFIG_NETPOLL=y
CONFIG_NETPOLL_RX=y
@@ -1427,7 +1484,7 @@
CONFIG_ISDN_PPP_VJ=y
CONFIG_ISDN_MPP=y
CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=n
+CONFIG_ISDN_PPP_BSDCOMP=m
CONFIG_ISDN_AUDIO=y
CONFIG_ISDN_TTY_FAX=y
@@ -1575,7 +1632,7 @@
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
CONFIG_INPUT_TSDEV=n
-CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVDEV=m
CONFIG_INPUT_EVBUG=n
#
@@ -1627,17 +1684,17 @@
CONFIG_TOUCHSCREEN_MK712=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=n
+CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
#
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_CT82C710=n
-CONFIG_SERIO_PARKBD=n
-CONFIG_SERIO_PCIPS2=n
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_RAW=n
CONFIG_GAMEPORT=m
@@ -1654,7 +1711,8 @@
CONFIG_HW_CONSOLE=y
CONFIG_SERIAL_NONSTANDARD=y
CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=n
+CONFIG_CYCLADES=m
+CONFIG_CYZ_INTR=n
CONFIG_MOXA_SMARTIO=n
CONFIG_ISI=n
CONFIG_SYNCLINK=m
@@ -1748,27 +1806,29 @@
CONFIG_USBPCWATCHDOG=m
CONFIG_HW_RANDOM=m
CONFIG_NVRAM=m
-CONFIG_RTC=y
+CONFIG_RTC=m
+CONFIG_GEN_RTC=m
+CONFIG_GEN_RTC_X=n
CONFIG_DTLK=m
CONFIG_R3964=m
-CONFIG_APPLICOM=n
+CONFIG_APPLICOM=m
CONFIG_SONYPI=m
#
# Ftape, the floppy tape device driver
#
-CONFIG_AGP=y
-CONFIG_AGP_ALI=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP_EFFICEON=y
-CONFIG_DRM=y
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_DRM=m
CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
@@ -1797,6 +1857,7 @@
CONFIG_TCG_TPM=m
CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
#
# I2C support
@@ -1825,11 +1886,11 @@
CONFIG_I2C_PIIX4=m
CONFIG_I2C_ISA=m
CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PARPORT=n
-CONFIG_I2C_PARPORT_LIGHT=n
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PROSAVAGE=m
CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=n
+CONFIG_SCx200_ACB=m
CONFIG_I2C_SIS5595=m
CONFIG_I2C_SIS630=m
CONFIG_I2C_SIS96X=m
@@ -2097,7 +2158,7 @@
CONFIG_FB_SOFT_CURSOR=y
CONFIG_FB_MACMODES=n
CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
+CONFIG_FB_TILEBLITTING=n
CONFIG_FB_CIRRUS=m
CONFIG_FB_PM2=n
CONFIG_FB_CYBER2000=n
@@ -2106,6 +2167,9 @@
CONFIG_FB_IMSTT=n
CONFIG_FB_VGA16=m
CONFIG_FB_VESA=y
+CONFIG_FB_VESA_STD=n
+CONFIG_FB_VESA_TNG=y
+CONFIG_FB_VESA_DEFAULT_MODE="[EMAIL PROTECTED]"
CONFIG_VIDEO_SELECT=y
CONFIG_FB_HGA=m
CONFIG_FB_HGA_ACCEL=y
@@ -2171,7 +2235,12 @@
CONFIG_LOGO_LINUX_MONO=n
CONFIG_LOGO_LINUX_VGA16=n
CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=n
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_DEVICE=y
+CONFIG_FB_SPLASH=y
#
# Bootsplash configuration
@@ -2212,7 +2281,7 @@
CONFIG_SND_DUMMY=m
CONFIG_SND_VIRMIDI=m
CONFIG_SND_MTPAV=m
-CONFIG_SND_SERIAL_U16550=n
+CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_MPU401=m
#
@@ -2241,7 +2310,7 @@
CONFIG_SND_SB16=m
CONFIG_SND_SBAWE=m
CONFIG_SND_SB16_CSP=y
-CONFIG_SND_WAVEFRONT=n
+CONFIG_SND_WAVEFRONT=m
CONFIG_SND_ALS100=m
CONFIG_SND_AZT2320=m
CONFIG_SND_CMI8330=m
@@ -2307,7 +2376,7 @@
#
# PCMCIA devices
#
-CONFIG_SND_VXPOCKET=n
+CONFIG_SND_VXPOCKET=m
CONFIG_SND_PDAUDIOCF=m
#
@@ -2327,7 +2396,7 @@
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
-CONFIG_USB_BANDWIDTH=n
+CONFIG_USB_BANDWIDTH=y
CONFIG_USB_DYNAMIC_MINORS=n
CONFIG_USB_SUSPEND=y
CONFIG_USB_OTG=n
@@ -2376,6 +2445,7 @@
# USB Input Devices
#
CONFIG_USB_HID=y
+CONFIG_USB_HID_MOUSE_POLLING_INTERVAL=10
CONFIG_USB_HIDINPUT=y
CONFIG_HID_FF=y
CONFIG_HID_PID=y
@@ -2506,13 +2576,13 @@
# USB Miscellaneous drivers
#
CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=n
+CONFIG_USB_EMI26=m
CONFIG_USB_AUERSWALD=m
CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m
CONFIG_USB_LCD=m
CONFIG_USB_LED=m
-CONFIG_USB_CYTHERM=n
+CONFIG_USB_CYTHERM=m
CONFIG_USB_PHIDGETKIT=m
CONFIG_USB_PHIDGETSERVO=m
CONFIG_USB_IDMOUSE=m
@@ -2523,6 +2593,10 @@
#
# USB DSL modem support
#
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_XUSBATM=m
#
# USB Gadget Support
@@ -2554,6 +2628,7 @@
#
# File systems
#
+CONFIG_UNION_FS=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -2566,6 +2641,8 @@
CONFIG_JBD=m
CONFIG_JBD_DEBUG=n
CONFIG_FS_MBCACHE=y
+CONFIG_REISER4_FS=m
+CONFIG_REISER4_DEBUG=n
CONFIG_REISERFS_FS=m
CONFIG_REISERFS_CHECK=n
CONFIG_REISERFS_PROC_INFO=y
@@ -2592,8 +2669,8 @@
CONFIG_ROMFS_FS=m
CONFIG_INOTIFY=y
CONFIG_QUOTA=y
-CONFIG_QFMT_V1=n
-CONFIG_QFMT_V2=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
CONFIG_AUTOFS_FS=m
@@ -2659,6 +2736,10 @@
CONFIG_JFFS2_CMODE_PRIORITY=y
CONFIG_JFFS2_CMODE_SIZE=n
CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_EMBEDDED=n
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_SQUASHFS_VMALLOC=n
CONFIG_VXFS_FS=m
CONFIG_HPFS_FS=n
CONFIG_QNX4FS_FS=m
@@ -2703,8 +2784,11 @@
CONFIG_NCPFS_SMALLDOS=y
CONFIG_NCPFS_NLS=y
CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=n
-CONFIG_AFS_FS=n
+CONFIG_CODA_FS=m
+CONFIG_CODA_FS_OLD_API=n
+CONFIG_AFS_FS=m
+CONFIG_SH_FS=m
+CONFIG_RXRPC=m
#
# Partition Types
@@ -2785,6 +2869,7 @@
CONFIG_LOG_BUF_SHIFT=17
CONFIG_SCHEDSTATS=n
CONFIG_DEBUG_SLAB=n
+CONFIG_DEBUG_PREEMPT=y
CONFIG_DEBUG_SPINLOCK=n
CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_KOBJECT=n
@@ -2800,6 +2885,10 @@
CONFIG_KPROBES=n
CONFIG_DEBUG_STACK_USAGE=n
CONFIG_DEBUG_PAGEALLOC=n
+
+#
+# Page alloc debug is incompatible with Software Suspend on i386
+#
CONFIG_4KSTACKS=n
CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
@@ -2812,7 +2901,7 @@
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_ROOTPLUG=n
+CONFIG_SECURITY_ROOTPLUG=m
CONFIG_SECURITY_SECLVL=m
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -2848,6 +2937,7 @@
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZF=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_TEST=n
patch-2.6.13-ck1.bz2: removed
Committed by: xiaowen
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits
