diff --git a/projects/enna/linux/linux.i386.conf b/projects/enna/linux/linux.i386.conf index f0e7c1dfb..abcb2aea4 100644 --- a/projects/enna/linux/linux.i386.conf +++ b/projects/enna/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32-rc3 +# Linux kernel version: 2.6.32-rc5 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -16,7 +16,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_MMU=y CONFIG_ZONE_DMA=y CONFIG_GENERIC_ISA_DMA=y @@ -106,7 +105,7 @@ CONFIG_USER_SCHED=y CONFIG_RELAY=y # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="/home/stephan/projects/OpenELEC/packages/linux/config/initramfs" +CONFIG_INITRAMFS_SOURCE=" " CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 # CONFIG_RD_GZIP is not set @@ -122,8 +121,7 @@ CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_EXTRA_PASS=y +# CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -153,7 +151,6 @@ CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -252,8 +249,9 @@ CONFIG_X86_POPAD_OK=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_DEBUGCTLMSR=y # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y @@ -817,6 +815,7 @@ CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -916,22 +915,6 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set -CONFIG_INPUT_LIRC=y -CONFIG_LIRC_DEV=m -# CONFIG_LIRC_BT829 is not set -# CONFIG_LIRC_ENE0100 is not set -# CONFIG_LIRC_I2C is not set -# CONFIG_LIRC_IGORPLUGUSB is not set -# CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_IT87 is not set -# CONFIG_LIRC_ITE8709 is not set -CONFIG_LIRC_MCEUSB=m -# CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set -# CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_STREAMZAP is not set -# CONFIG_LIRC_TTUSBIR is not set -# CONFIG_LIRC_ZILOG is not set # CONFIG_INPUT_MISC is not set # diff --git a/projects/intel/linux/linux.i386.conf b/projects/intel/linux/linux.i386.conf index f0e7c1dfb..abcb2aea4 100644 --- a/projects/intel/linux/linux.i386.conf +++ b/projects/intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32-rc3 +# Linux kernel version: 2.6.32-rc5 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -16,7 +16,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_MMU=y CONFIG_ZONE_DMA=y CONFIG_GENERIC_ISA_DMA=y @@ -106,7 +105,7 @@ CONFIG_USER_SCHED=y CONFIG_RELAY=y # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="/home/stephan/projects/OpenELEC/packages/linux/config/initramfs" +CONFIG_INITRAMFS_SOURCE=" " CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 # CONFIG_RD_GZIP is not set @@ -122,8 +121,7 @@ CONFIG_ANON_INODES=y CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_EXTRA_PASS=y +# CONFIG_KALLSYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -153,7 +151,6 @@ CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -252,8 +249,9 @@ CONFIG_X86_POPAD_OK=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_DEBUGCTLMSR=y # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y @@ -817,6 +815,7 @@ CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_VMXNET3 is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -916,22 +915,6 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set -CONFIG_INPUT_LIRC=y -CONFIG_LIRC_DEV=m -# CONFIG_LIRC_BT829 is not set -# CONFIG_LIRC_ENE0100 is not set -# CONFIG_LIRC_I2C is not set -# CONFIG_LIRC_IGORPLUGUSB is not set -# CONFIG_LIRC_IMON is not set -# CONFIG_LIRC_IT87 is not set -# CONFIG_LIRC_ITE8709 is not set -CONFIG_LIRC_MCEUSB=m -# CONFIG_LIRC_SASEM is not set -# CONFIG_LIRC_SERIAL is not set -# CONFIG_LIRC_SIR is not set -# CONFIG_LIRC_STREAMZAP is not set -# CONFIG_LIRC_TTUSBIR is not set -# CONFIG_LIRC_ZILOG is not set # CONFIG_INPUT_MISC is not set #