Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / include / linux / autoconf.h

diff --git a/include/linux/autoconf.h b/include/linux/autoconf.h
index 546d521..6b7b49b 100644 (file)
--- a/include/linux/autoconf.h
+++ b/include/linux/autoconf.h
@@ -1,41 +1,62 @@
 /*
  * Automatically generated C config: don't edit
+ * Linux kernel version: 2.6.17.13
+ * Wed Oct 18 17:15:54 2006
  */
 #define AUTOCONF_INCLUDED
+#define CONFIG_X86_32 1
+#define CONFIG_SEMAPHORE_SLEEPERS 1
 #define CONFIG_X86 1
 #define CONFIG_MMU 1
-#define CONFIG_UID16 1
 #define CONFIG_GENERIC_ISA_DMA 1
+#define CONFIG_GENERIC_IOMAP 1
+#define CONFIG_GENERIC_HWEIGHT 1
+#define CONFIG_ARCH_MAY_HAVE_PC_FDC 1
+#define CONFIG_DMI 1
 
 /*
  * Code maturity level options
  */
 #define CONFIG_EXPERIMENTAL 1
-#define CONFIG_CLEAN_COMPILE 1
-#define CONFIG_STANDALONE 1
+#define CONFIG_BROKEN_ON_SMP 1
+#define CONFIG_INIT_ENV_ARG_LIMIT 32
 
 /*
  * General setup
  */
+#define CONFIG_LOCALVERSION ""
+#undef CONFIG_LOCALVERSION_AUTO
 #define CONFIG_SWAP 1
 #define CONFIG_SYSVIPC 1
 #define CONFIG_POSIX_MQUEUE 1
 #define CONFIG_BSD_PROCESS_ACCT 1
+#undef CONFIG_BSD_PROCESS_ACCT_V3
 #define CONFIG_SYSCTL 1
-#undef CONFIG_AUDIT
-#define CONFIG_LOG_BUF_SHIFT 17
-#define CONFIG_HOTPLUG 1
+#define CONFIG_AUDIT 1
+#define CONFIG_AUDITSYSCALL 1
 #undef CONFIG_IKCONFIG
+#define CONFIG_RELAY 1
+#define CONFIG_INITRAMFS_SOURCE ""
+#define CONFIG_UID16 1
+#define CONFIG_VM86 1
+#define CONFIG_CC_OPTIMIZE_FOR_SIZE 1
 #undef CONFIG_EMBEDDED
 #define CONFIG_KALLSYMS 1
 #undef CONFIG_KALLSYMS_ALL
+#define CONFIG_KALLSYMS_EXTRA_PASS 1
+#define CONFIG_HOTPLUG 1
+#define CONFIG_PRINTK 1
+#define CONFIG_BUG 1
+#define CONFIG_ELF_CORE 1
+#define CONFIG_BASE_FULL 1
 #define CONFIG_FUTEX 1
 #define CONFIG_EPOLL 1
-#define CONFIG_IOSCHED_NOOP 1
-#define CONFIG_IOSCHED_AS 1
-#define CONFIG_IOSCHED_DEADLINE 1
-#define CONFIG_IOSCHED_CFQ 1
-#define CONFIG_CC_OPTIMIZE_FOR_SIZE 1
+#define CONFIG_SHMEM 1
+#define CONFIG_SLAB 1
+#undef CONFIG_TINY_SHMEM
+#define CONFIG_BASE_SMALL 0
+#undef CONFIG_SLOB
+#define CONFIG_OBSOLETE_INTERMODULE_MODULE 1
 
 /*
  * Loadable module support
@@ -43,24 +64,46 @@
 #define CONFIG_MODULES 1
 #define CONFIG_MODULE_UNLOAD 1
 #undef CONFIG_MODULE_FORCE_UNLOAD
-#define CONFIG_OBSOLETE_MODPARM 1
-#undef CONFIG_MODVERSIONS
+#define CONFIG_MODVERSIONS 1
+#define CONFIG_MODULE_SRCVERSION_ALL 1
+#define CONFIG_MODULE_SIG 1
+#undef CONFIG_MODULE_SIG_FORCE
 #define CONFIG_KMOD 1
-#define CONFIG_STOP_MACHINE 1
+
+/*
+ * Block layer
+ */
+#define CONFIG_LBD 1
+#define CONFIG_BLK_DEV_IO_TRACE 1
+#define CONFIG_LSF 1
+
+/*
+ * IO Schedulers
+ */
+#define CONFIG_IOSCHED_NOOP 1
+#define CONFIG_IOSCHED_AS 1
+#define CONFIG_IOSCHED_DEADLINE 1
+#define CONFIG_IOSCHED_CFQ 1
+#undef CONFIG_DEFAULT_AS
+#undef CONFIG_DEFAULT_DEADLINE
+#define CONFIG_DEFAULT_CFQ 1
+#undef CONFIG_DEFAULT_NOOP
+#define CONFIG_DEFAULT_IOSCHED "cfq"
 
 /*
  * Processor type and features
  */
-#undef CONFIG_X86_PC
+#undef CONFIG_SMP
+#define CONFIG_X86_PC 1
+#undef CONFIG_X86_XEN
 #undef CONFIG_X86_ELAN
 #undef CONFIG_X86_VOYAGER
 #undef CONFIG_X86_NUMAQ
 #undef CONFIG_X86_SUMMIT
 #undef CONFIG_X86_BIGSMP
 #undef CONFIG_X86_VISWS
-#define CONFIG_X86_GENERICARCH 1
+#undef CONFIG_X86_GENERICARCH
 #undef CONFIG_X86_ES7000
-#define CONFIG_X86_CYCLONE_TIMER 1
 #undef CONFIG_M386
 #undef CONFIG_M486
 #undef CONFIG_M586
@@ -75,9 +118,12 @@
 #undef CONFIG_MK7
 #undef CONFIG_MK8
 #undef CONFIG_MCRUSOE
+#undef CONFIG_MEFFICEON
 #undef CONFIG_MWINCHIPC6
 #undef CONFIG_MWINCHIP2
 #undef CONFIG_MWINCHIP3D
+#undef CONFIG_MGEODEGX1
+#undef CONFIG_MGEODE_LX
 #undef CONFIG_MCYRIXIII
 #undef CONFIG_MVIAC3_2
 #define CONFIG_X86_GENERIC 1
@@ -85,85 +131,111 @@
 #define CONFIG_X86_XADD 1
 #define CONFIG_X86_L1_CACHE_SHIFT 7
 #define CONFIG_RWSEM_XCHGADD_ALGORITHM 1
+#define CONFIG_GENERIC_CALIBRATE_DELAY 1
 #define CONFIG_X86_PPRO_FENCE 1
 #define CONFIG_X86_WP_WORKS_OK 1
 #define CONFIG_X86_INVLPG 1
 #define CONFIG_X86_BSWAP 1
 #define CONFIG_X86_POPAD_OK 1
+#define CONFIG_X86_CMPXCHG64 1
 #define CONFIG_X86_GOOD_APIC 1
 #define CONFIG_X86_INTEL_USERCOPY 1
 #define CONFIG_X86_USE_PPRO_CHECKSUM 1
-#define CONFIG_X86_4G 1
-#define CONFIG_X86_SWITCH_PAGETABLES 1
-#define CONFIG_X86_4G_VM_LAYOUT 1
-#define CONFIG_X86_UACCESS_INDIRECT 1
-#define CONFIG_X86_HIGH_ENTRY 1
+#define CONFIG_X86_TSC 1
 #define CONFIG_HPET_TIMER 1
 #define CONFIG_HPET_EMULATE_RTC 1
-#define CONFIG_SMP 1
-#define CONFIG_NR_CPUS 32
-#define CONFIG_SCHED_SMT 1
+#undef CONFIG_PREEMPT_NONE
+#define CONFIG_PREEMPT_VOLUNTARY 1
 #undef CONFIG_PREEMPT
+#define CONFIG_X86_UP_APIC 1
+#define CONFIG_X86_UP_IOAPIC 1
 #define CONFIG_X86_LOCAL_APIC 1
 #define CONFIG_X86_IO_APIC 1
-#define CONFIG_X86_TSC 1
 #define CONFIG_X86_MCE 1
 #undef CONFIG_X86_MCE_NONFATAL
 #define CONFIG_X86_MCE_P4THERMAL 1
 #define CONFIG_TOSHIBA_MODULE 1
 #define CONFIG_I8K_MODULE 1
+#undef CONFIG_X86_REBOOTFIXUPS
 #define CONFIG_MICROCODE_MODULE 1
 #define CONFIG_X86_MSR_MODULE 1
 #define CONFIG_X86_CPUID_MODULE 1
+#undef CONFIG_SWIOTLB
 
 /*
  * Firmware Drivers
  */
 #define CONFIG_EDD_MODULE 1
+#define CONFIG_EFI_VARS 1
+#define CONFIG_DELL_RBU_MODULE 1
+#define CONFIG_DCDBAS_MODULE 1
 #undef CONFIG_NOHIGHMEM
-#undef CONFIG_HIGHMEM4G
-#define CONFIG_HIGHMEM64G 1
+#define CONFIG_HIGHMEM4G 1
+#undef CONFIG_HIGHMEM64G
+#define CONFIG_PAGE_OFFSET 0xC0000000
 #define CONFIG_HIGHMEM 1
-#define CONFIG_X86_PAE 1
-#undef CONFIG_NUMA
+#define CONFIG_ARCH_FLATMEM_ENABLE 1
+#define CONFIG_ARCH_SPARSEMEM_ENABLE 1
+#define CONFIG_ARCH_SELECT_MEMORY_MODEL 1
+#define CONFIG_SELECT_MEMORY_MODEL 1
+#define CONFIG_FLATMEM_MANUAL 1
+#undef CONFIG_DISCONTIGMEM_MANUAL
+#undef CONFIG_SPARSEMEM_MANUAL
+#define CONFIG_FLATMEM 1
+#define CONFIG_FLAT_NODE_MEM_MAP 1
+#define CONFIG_SPARSEMEM_STATIC 1
+#define CONFIG_SPLIT_PTLOCK_CPUS 4096
 #define CONFIG_HIGHPTE 1
 #undef CONFIG_MATH_EMULATION
 #define CONFIG_MTRR 1
-#undef CONFIG_EFI
-#undef CONFIG_IRQBALANCE
-#define CONFIG_HAVE_DEC_LOCK 1
+#define CONFIG_EFI 1
+#define CONFIG_BOOT_IOREMAP 1
 #define CONFIG_REGPARM 1
+#undef CONFIG_SECCOMP
+#undef CONFIG_HZ_100
+#define CONFIG_HZ_250 1
+#undef CONFIG_HZ_1000
+#define CONFIG_HZ 250
+#define CONFIG_KEXEC 1
+#undef CONFIG_CRASH_DUMP
+#define CONFIG_PHYSICAL_START 0x400000
+#define CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG 1
 
 /*
  * Power management options (ACPI, APM)
  */
 #define CONFIG_PM 1
-#undef CONFIG_SOFTWARE_SUSPEND
-#undef CONFIG_PM_DISK
+#define CONFIG_PM_LEGACY 1
+#define CONFIG_PM_DEBUG 1
+#define CONFIG_SOFTWARE_SUSPEND 1
+#define CONFIG_PM_STD_PARTITION ""
 
 /*
  * ACPI (Advanced Configuration and Power Interface) Support
  */
 #define CONFIG_ACPI 1
-#define CONFIG_ACPI_BOOT 1
-#define CONFIG_ACPI_INTERPRETER 1
 #define CONFIG_ACPI_SLEEP 1
 #define CONFIG_ACPI_SLEEP_PROC_FS 1
+#undef CONFIG_ACPI_SLEEP_PROC_SLEEP
 #define CONFIG_ACPI_AC_MODULE 1
 #define CONFIG_ACPI_BATTERY_MODULE 1
 #define CONFIG_ACPI_BUTTON_MODULE 1
+#define CONFIG_ACPI_VIDEO_MODULE 1
+#undef CONFIG_ACPI_HOTKEY
 #define CONFIG_ACPI_FAN 1
 #define CONFIG_ACPI_PROCESSOR 1
 #define CONFIG_ACPI_THERMAL 1
 #define CONFIG_ACPI_ASUS_MODULE 1
+#define CONFIG_ACPI_IBM_MODULE 1
+#define CONFIG_ACPI_IBM_DOCK 1
 #define CONFIG_ACPI_TOSHIBA_MODULE 1
+#define CONFIG_ACPI_BLACKLIST_YEAR 1999
 #undef CONFIG_ACPI_DEBUG
-#define CONFIG_ACPI_BUS 1
 #define CONFIG_ACPI_EC 1
 #define CONFIG_ACPI_POWER 1
-#define CONFIG_ACPI_PCI 1
 #define CONFIG_ACPI_SYSTEM 1
 #define CONFIG_X86_PM_TIMER 1
+#undef CONFIG_ACPI_CONTAINER
 
 /*
  * APM (Advanced Power Management) BIOS Support
@@ -181,34 +253,43 @@
  * CPU Frequency scaling
  */
 #define CONFIG_CPU_FREQ 1
-#undef CONFIG_CPU_FREQ_PROC_INTF
+#define CONFIG_CPU_FREQ_TABLE 1
+#define CONFIG_CPU_FREQ_DEBUG 1
+#define CONFIG_CPU_FREQ_STAT_MODULE 1
+#define CONFIG_CPU_FREQ_STAT_DETAILS 1
 #undef CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE
 #define CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE 1
 #define CONFIG_CPU_FREQ_GOV_PERFORMANCE 1
 #define CONFIG_CPU_FREQ_GOV_POWERSAVE_MODULE 1
 #define CONFIG_CPU_FREQ_GOV_USERSPACE 1
-#undef CONFIG_CPU_FREQ_24_API
-#define CONFIG_CPU_FREQ_TABLE 1
+#define CONFIG_CPU_FREQ_GOV_ONDEMAND_MODULE 1
+#define CONFIG_CPU_FREQ_GOV_CONSERVATIVE_MODULE 1
 
 /*
  * CPUFreq processor drivers
  */
 #define CONFIG_X86_ACPI_CPUFREQ_MODULE 1
-#undef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
-#define CONFIG_X86_POWERNOW_K6_MODULE 1
+#undef CONFIG_X86_POWERNOW_K6
 #define CONFIG_X86_POWERNOW_K7 1
-#define CONFIG_X86_POWERNOW_K8_MODULE 1
+#define CONFIG_X86_POWERNOW_K7_ACPI 1
+#define CONFIG_X86_POWERNOW_K8 1
+#define CONFIG_X86_POWERNOW_K8_ACPI 1
 #undef CONFIG_X86_GX_SUSPMOD
 #define CONFIG_X86_SPEEDSTEP_CENTRINO 1
-#define CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE 1
 #define CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI 1
+#define CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE 1
 #define CONFIG_X86_SPEEDSTEP_ICH 1
-#define CONFIG_X86_SPEEDSTEP_SMI_MODULE 1
+#define CONFIG_X86_SPEEDSTEP_SMI 1
 #define CONFIG_X86_P4_CLOCKMOD_MODULE 1
+#undef CONFIG_X86_CPUFREQ_NFORCE2
+#define CONFIG_X86_LONGRUN 1
+
+/*
+ * shared options
+ */
+#undef CONFIG_X86_ACPI_CPUFREQ_PROC_INTF
 #define CONFIG_X86_SPEEDSTEP_LIB 1
 #undef CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
-#define CONFIG_X86_LONGRUN 1
-#undef CONFIG_X86_LONGHAUL
 
 /*
  * Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -217,810 +298,1029 @@
 #undef CONFIG_PCI_GOBIOS
 #undef CONFIG_PCI_GOMMCONFIG
 #undef CONFIG_PCI_GODIRECT
+#undef CONFIG_PCI_GOXEN_FE
 #define CONFIG_PCI_GOANY 1
 #define CONFIG_PCI_BIOS 1
 #define CONFIG_PCI_DIRECT 1
 #define CONFIG_PCI_MMCONFIG 1
-#define CONFIG_PCI_USE_VECTOR 1
-#define CONFIG_PCI_LEGACY_PROC 1
-#undef CONFIG_PCI_NAMES
+#define CONFIG_PCIEPORTBUS 1
+#define CONFIG_HOTPLUG_PCI_PCIE_MODULE 1
+#undef CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE
+#define CONFIG_PCI_MSI 1
+#undef CONFIG_PCI_DEBUG
+#define CONFIG_ISA_DMA_API 1
 #define CONFIG_ISA 1
 #undef CONFIG_EISA
 #undef CONFIG_MCA
 #undef CONFIG_SCx200
 
 /*
- * PCMCIA/CardBus support
+ * PCCARD (PCMCIA/CardBus) support
  */
-#define CONFIG_PCMCIA_MODULE 1
+#define CONFIG_PCCARD 1
 #undef CONFIG_PCMCIA_DEBUG
-#define CONFIG_YENTA_MODULE 1
+#define CONFIG_PCMCIA 1
+#define CONFIG_PCMCIA_LOAD_CIS 1
+#define CONFIG_PCMCIA_IOCTL 1
 #define CONFIG_CARDBUS 1
+
+/*
+ * PC-card bridges
+ */
+#define CONFIG_YENTA 1
+#define CONFIG_YENTA_O2 1
+#define CONFIG_YENTA_RICOH 1
+#define CONFIG_YENTA_TI 1
+#define CONFIG_YENTA_ENE_TUNE 1
+#define CONFIG_YENTA_TOSHIBA 1
+#define CONFIG_PD6729_MODULE 1
 #define CONFIG_I82092_MODULE 1
-#define CONFIG_I82365_MODULE 1
-#define CONFIG_TCIC_MODULE 1
+#undef CONFIG_I82365
+#undef CONFIG_TCIC
 #define CONFIG_PCMCIA_PROBE 1
+#define CONFIG_PCCARD_NONSTATIC 1
 
 /*
  * PCI Hotplug Support
  */
 #define CONFIG_HOTPLUG_PCI 1
-#undef CONFIG_HOTPLUG_PCI_FAKE
+#define CONFIG_HOTPLUG_PCI_FAKE_MODULE 1
 #define CONFIG_HOTPLUG_PCI_COMPAQ_MODULE 1
 #undef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
 #define CONFIG_HOTPLUG_PCI_IBM_MODULE 1
-#undef CONFIG_HOTPLUG_PCI_ACPI
+#define CONFIG_HOTPLUG_PCI_ACPI_MODULE 1
+#define CONFIG_HOTPLUG_PCI_ACPI_IBM_MODULE 1
 #undef CONFIG_HOTPLUG_PCI_CPCI
-#define CONFIG_HOTPLUG_PCI_PCIE_MODULE 1
-#define CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE 1
-#define CONFIG_HOTPLUG_PCI_SHPC_MODULE 1
-#define CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE 1
+#undef CONFIG_HOTPLUG_PCI_SHPC
 
 /*
  * Executable file formats
  */
 #define CONFIG_BINFMT_ELF 1
 #undef CONFIG_BINFMT_AOUT
-#define CONFIG_BINFMT_MISC_MODULE 1
+#define CONFIG_BINFMT_MISC 1
 
 /*
- * Device Drivers
+ * Networking
  */
+#define CONFIG_NET 1
 
 /*
- * Generic Driver Options
+ * Networking options
  */
-#define CONFIG_FW_LOADER 1
-#undef CONFIG_DEBUG_DRIVER
+#undef CONFIG_NETDEBUG
+#define CONFIG_PACKET 1
+#define CONFIG_PACKET_MMAP 1
+#define CONFIG_UNIX 1
+#define CONFIG_XFRM 1
+#define CONFIG_XFRM_USER 1
+#define CONFIG_NET_KEY_MODULE 1
+#define CONFIG_INET 1
+#define CONFIG_IP_MULTICAST 1
+#define CONFIG_IP_ADVANCED_ROUTER 1
+#define CONFIG_ASK_IP_FIB_HASH 1
+#undef CONFIG_IP_FIB_TRIE
+#define CONFIG_IP_FIB_HASH 1
+#define CONFIG_IP_MULTIPLE_TABLES 1
+#define CONFIG_IP_ROUTE_FWMARK 1
+#define CONFIG_IP_ROUTE_MULTIPATH 1
+#undef CONFIG_IP_ROUTE_MULTIPATH_CACHED
+#define CONFIG_IP_ROUTE_VERBOSE 1
+#undef CONFIG_IP_PNP
+#define CONFIG_NET_IPIP_MODULE 1
+#define CONFIG_NET_IPGRE_MODULE 1
+#define CONFIG_NET_IPGRE_BROADCAST 1
+#define CONFIG_IP_MROUTE 1
+#define CONFIG_IP_PIMSM_V1 1
+#define CONFIG_IP_PIMSM_V2 1
+#undef CONFIG_ARPD
+#define CONFIG_SYN_COOKIES 1
+#define CONFIG_INET_AH_MODULE 1
+#define CONFIG_INET_ESP_MODULE 1
+#define CONFIG_INET_IPCOMP_MODULE 1
+#define CONFIG_INET_XFRM_TUNNEL_MODULE 1
+#define CONFIG_INET_TUNNEL_MODULE 1
+#define CONFIG_INET_DIAG_MODULE 1
+#define CONFIG_INET_TCP_DIAG_MODULE 1
+#undef CONFIG_TCP_CONG_ADVANCED
+#define CONFIG_TCP_CONG_BIC 1
 
 /*
- * Memory Technology Devices (MTD)
+ * IP: Virtual Server Configuration
  */
-#define CONFIG_MTD_MODULE 1
-#undef CONFIG_MTD_DEBUG
-#define CONFIG_MTD_PARTITIONS_MODULE 1
-#define CONFIG_MTD_CONCAT_MODULE 1
-#define CONFIG_MTD_REDBOOT_PARTS_MODULE 1
-#define CONFIG_MTD_CMDLINE_PARTS_MODULE 1
+#define CONFIG_IP_VS_MODULE 1
+#undef CONFIG_IP_VS_DEBUG
+#define CONFIG_IP_VS_TAB_BITS 12
 
 /*
- * User Modules And Translation Layers
+ * IPVS transport protocol load balancing support
  */
-#define CONFIG_MTD_CHAR_MODULE 1
-#define CONFIG_MTD_BLOCK_MODULE 1
-#define CONFIG_MTD_BLOCK_RO_MODULE 1
-#define CONFIG_FTL_MODULE 1
-#define CONFIG_NFTL_MODULE 1
-#define CONFIG_NFTL_RW 1
-#define CONFIG_INFTL_MODULE 1
+#define CONFIG_IP_VS_PROTO_TCP 1
+#define CONFIG_IP_VS_PROTO_UDP 1
+#define CONFIG_IP_VS_PROTO_ESP 1
+#define CONFIG_IP_VS_PROTO_AH 1
 
 /*
- * RAM/ROM/Flash chip drivers
+ * IPVS scheduler
  */
-#define CONFIG_MTD_CFI_MODULE 1
-#define CONFIG_MTD_JEDECPROBE_MODULE 1
-#define CONFIG_MTD_GEN_PROBE_MODULE 1
-#undef CONFIG_MTD_CFI_ADV_OPTIONS
-#define CONFIG_MTD_CFI_INTELEXT_MODULE 1
-#define CONFIG_MTD_CFI_AMDSTD_MODULE 1
-#define CONFIG_MTD_CFI_STAA_MODULE 1
-#define CONFIG_MTD_RAM_MODULE 1
-#define CONFIG_MTD_ROM_MODULE 1
-#define CONFIG_MTD_ABSENT_MODULE 1
-#undef CONFIG_MTD_OBSOLETE_CHIPS
+#define CONFIG_IP_VS_RR_MODULE 1
+#define CONFIG_IP_VS_WRR_MODULE 1
+#define CONFIG_IP_VS_LC_MODULE 1
+#define CONFIG_IP_VS_WLC_MODULE 1
+#define CONFIG_IP_VS_LBLC_MODULE 1
+#define CONFIG_IP_VS_LBLCR_MODULE 1
+#define CONFIG_IP_VS_DH_MODULE 1
+#define CONFIG_IP_VS_SH_MODULE 1
+#define CONFIG_IP_VS_SED_MODULE 1
+#define CONFIG_IP_VS_NQ_MODULE 1
 
 /*
- * Mapping drivers for chip access
+ * IPVS application helper
  */
-#define CONFIG_MTD_COMPLEX_MAPPINGS 1
-#undef CONFIG_MTD_PHYSMAP
-#undef CONFIG_MTD_PNC2000
-#define CONFIG_MTD_SC520CDP_MODULE 1
-#define CONFIG_MTD_NETSC520_MODULE 1
-#define CONFIG_MTD_SBC_GXX_MODULE 1
-#define CONFIG_MTD_ELAN_104NC_MODULE 1
-#define CONFIG_MTD_SCx200_DOCFLASH_MODULE 1
-#define CONFIG_MTD_AMD76XROM_MODULE 1
-#define CONFIG_MTD_ICH2ROM_MODULE 1
-#define CONFIG_MTD_SCB2_FLASH_MODULE 1
-#undef CONFIG_MTD_NETtel
-#undef CONFIG_MTD_DILNETPC
-#define CONFIG_MTD_L440GX_MODULE 1
-#define CONFIG_MTD_PCI_MODULE 1
+#define CONFIG_IP_VS_FTP_MODULE 1
+#define CONFIG_IPV6_MODULE 1
+#define CONFIG_IPV6_PRIVACY 1
+#define CONFIG_IPV6_ROUTER_PREF 1
+#define CONFIG_IPV6_ROUTE_INFO 1
+#define CONFIG_INET6_AH_MODULE 1
+#define CONFIG_INET6_ESP_MODULE 1
+#define CONFIG_INET6_IPCOMP_MODULE 1
+#define CONFIG_INET6_XFRM_TUNNEL_MODULE 1
+#define CONFIG_INET6_TUNNEL_MODULE 1
+#define CONFIG_IPV6_TUNNEL_MODULE 1
+#define CONFIG_NETFILTER 1
+#undef CONFIG_NETFILTER_DEBUG
+#define CONFIG_BRIDGE_NETFILTER 1
 
 /*
- * Self-contained MTD device drivers
+ * Core Netfilter Configuration
+ */
+#define CONFIG_NETFILTER_NETLINK_MODULE 1
+#define CONFIG_NETFILTER_NETLINK_QUEUE_MODULE 1
+#define CONFIG_NETFILTER_NETLINK_LOG_MODULE 1
+#define CONFIG_NETFILTER_XTABLES_MODULE 1
+#define CONFIG_NETFILTER_XT_TARGET_CLASSIFY_MODULE 1
+#define CONFIG_NETFILTER_XT_TARGET_CONNMARK_MODULE 1
+#define CONFIG_NETFILTER_XT_TARGET_MARK_MODULE 1
+#define CONFIG_NETFILTER_XT_TARGET_NFQUEUE_MODULE 1
+#define CONFIG_NETFILTER_XT_TARGET_NOTRACK_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_COMMENT_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_CONNBYTES_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_CONNMARK_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_CONNTRACK_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_DCCP_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_ESP_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_HELPER_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_LENGTH_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_LIMIT_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_MAC_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_MARK_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_POLICY_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_MULTIPORT_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_PHYSDEV_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_PKTTYPE_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_REALM_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_SCTP_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_STATE_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_STRING_MODULE 1
+#define CONFIG_NETFILTER_XT_MATCH_TCPMSS_MODULE 1
+
+/*
+ * IP: Netfilter Configuration
  */
-#define CONFIG_MTD_PMC551_MODULE 1
-#undef CONFIG_MTD_PMC551_BUGFIX
-#undef CONFIG_MTD_PMC551_DEBUG
-#undef CONFIG_MTD_SLRAM
-#define CONFIG_MTD_MTDRAM_MODULE 1
-#define CONFIG_MTDRAM_TOTAL_SIZE 4096
-#define CONFIG_MTDRAM_ERASE_SIZE 128
-#undef CONFIG_MTD_BLKMTD
+#define CONFIG_IP_NF_CONNTRACK_MODULE 1
+#define CONFIG_IP_NF_CT_ACCT 1
+#define CONFIG_IP_NF_CONNTRACK_MARK 1
+#define CONFIG_IP_NF_CONNTRACK_EVENTS 1
+#define CONFIG_IP_NF_CONNTRACK_NETLINK_MODULE 1
+#define CONFIG_IP_NF_CT_PROTO_SCTP_MODULE 1
+#define CONFIG_IP_NF_FTP_MODULE 1
+#define CONFIG_IP_NF_IRC_MODULE 1
+#define CONFIG_IP_NF_NETBIOS_NS_MODULE 1
+#define CONFIG_IP_NF_TFTP_MODULE 1
+#define CONFIG_IP_NF_AMANDA_MODULE 1
+#define CONFIG_IP_NF_PPTP_MODULE 1
+#define CONFIG_IP_NF_H323_MODULE 1
+#define CONFIG_IP_NF_QUEUE_MODULE 1
+#define CONFIG_IP_NF_IPTABLES_MODULE 1
+#define CONFIG_IP_NF_MATCH_IPRANGE_MODULE 1
+#define CONFIG_IP_NF_MATCH_TOS_MODULE 1
+#define CONFIG_IP_NF_MATCH_RECENT_MODULE 1
+#define CONFIG_IP_NF_MATCH_ECN_MODULE 1
+#define CONFIG_IP_NF_MATCH_DSCP_MODULE 1
+#define CONFIG_IP_NF_MATCH_AH_MODULE 1
+#define CONFIG_IP_NF_MATCH_TTL_MODULE 1
+#define CONFIG_IP_NF_MATCH_OWNER_MODULE 1
+#define CONFIG_IP_NF_MATCH_ADDRTYPE_MODULE 1
+#define CONFIG_IP_NF_MATCH_HASHLIMIT_MODULE 1
+#define CONFIG_IP_NF_FILTER_MODULE 1
+#define CONFIG_IP_NF_TARGET_REJECT_MODULE 1
+#define CONFIG_IP_NF_TARGET_LOG_MODULE 1
+#define CONFIG_IP_NF_TARGET_ULOG_MODULE 1
+#define CONFIG_IP_NF_TARGET_TCPMSS_MODULE 1
+#define CONFIG_IP_NF_NAT_MODULE 1
+#define CONFIG_IP_NF_NAT_NEEDED 1
+#define CONFIG_IP_NF_TARGET_MASQUERADE_MODULE 1
+#define CONFIG_IP_NF_TARGET_REDIRECT_MODULE 1
+#define CONFIG_IP_NF_TARGET_NETMAP_MODULE 1
+#define CONFIG_IP_NF_TARGET_SAME_MODULE 1
+#define CONFIG_IP_NF_NAT_SNMP_BASIC_MODULE 1
+#define CONFIG_IP_NF_NAT_IRC_MODULE 1
+#define CONFIG_IP_NF_NAT_FTP_MODULE 1
+#define CONFIG_IP_NF_NAT_TFTP_MODULE 1
+#define CONFIG_IP_NF_NAT_AMANDA_MODULE 1
+#define CONFIG_IP_NF_NAT_PPTP_MODULE 1
+#define CONFIG_IP_NF_NAT_H323_MODULE 1
+#define CONFIG_IP_NF_MANGLE_MODULE 1
+#define CONFIG_IP_NF_TARGET_TOS_MODULE 1
+#define CONFIG_IP_NF_TARGET_ECN_MODULE 1
+#define CONFIG_IP_NF_TARGET_DSCP_MODULE 1
+#define CONFIG_IP_NF_TARGET_TTL_MODULE 1
+#define CONFIG_IP_NF_TARGET_CLUSTERIP_MODULE 1
+#define CONFIG_IP_NF_RAW_MODULE 1
+#define CONFIG_IP_NF_ARPTABLES_MODULE 1
+#define CONFIG_IP_NF_ARPFILTER_MODULE 1
+#define CONFIG_IP_NF_ARP_MANGLE_MODULE 1
 
 /*
- * Disk-On-Chip Device Drivers
+ * IPv6: Netfilter Configuration (EXPERIMENTAL)
  */
-#define CONFIG_MTD_DOC2000_MODULE 1
-#undef CONFIG_MTD_DOC2001
-#define CONFIG_MTD_DOC2001PLUS_MODULE 1
-#define CONFIG_MTD_DOCPROBE_MODULE 1
-#undef CONFIG_MTD_DOCPROBE_ADVANCED
-#define CONFIG_MTD_DOCPROBE_ADDRESS 0x0
+#define CONFIG_IP6_NF_QUEUE_MODULE 1
+#define CONFIG_IP6_NF_IPTABLES_MODULE 1
+#define CONFIG_IP6_NF_MATCH_RT_MODULE 1
+#define CONFIG_IP6_NF_MATCH_OPTS_MODULE 1
+#define CONFIG_IP6_NF_MATCH_FRAG_MODULE 1
+#define CONFIG_IP6_NF_MATCH_HL_MODULE 1
+#define CONFIG_IP6_NF_MATCH_OWNER_MODULE 1
+#define CONFIG_IP6_NF_MATCH_IPV6HEADER_MODULE 1
+#define CONFIG_IP6_NF_MATCH_AH_MODULE 1
+#define CONFIG_IP6_NF_MATCH_EUI64_MODULE 1
+#define CONFIG_IP6_NF_FILTER_MODULE 1
+#define CONFIG_IP6_NF_TARGET_LOG_MODULE 1
+#define CONFIG_IP6_NF_TARGET_REJECT_MODULE 1
+#define CONFIG_IP6_NF_MANGLE_MODULE 1
+#define CONFIG_IP6_NF_TARGET_HL_MODULE 1
+#define CONFIG_IP6_NF_RAW_MODULE 1
 
 /*
- * NAND Flash Device Drivers
+ * DECnet: Netfilter Configuration
  */
-#define CONFIG_MTD_NAND_MODULE 1
-#undef CONFIG_MTD_NAND_VERIFY_WRITE
-#define CONFIG_MTD_NAND_IDS_MODULE 1
+#undef CONFIG_DECNET_NF_GRABULATOR
 
 /*
- * Parallel port support
+ * Bridge: Netfilter Configuration
  */
-#define CONFIG_PARPORT_MODULE 1
-#define CONFIG_PARPORT_PC_MODULE 1
-#define CONFIG_PARPORT_PC_CML1_MODULE 1
-#define CONFIG_PARPORT_SERIAL_MODULE 1
-#undef CONFIG_PARPORT_PC_FIFO
-#undef CONFIG_PARPORT_PC_SUPERIO
-#define CONFIG_PARPORT_PC_PCMCIA_MODULE 1
-#undef CONFIG_PARPORT_OTHER
-#define CONFIG_PARPORT_1284 1
+#define CONFIG_BRIDGE_NF_EBTABLES_MODULE 1
+#define CONFIG_BRIDGE_EBT_BROUTE_MODULE 1
+#define CONFIG_BRIDGE_EBT_T_FILTER_MODULE 1
+#define CONFIG_BRIDGE_EBT_T_NAT_MODULE 1
+#define CONFIG_BRIDGE_EBT_802_3_MODULE 1
+#define CONFIG_BRIDGE_EBT_AMONG_MODULE 1
+#define CONFIG_BRIDGE_EBT_ARP_MODULE 1
+#define CONFIG_BRIDGE_EBT_IP_MODULE 1
+#define CONFIG_BRIDGE_EBT_LIMIT_MODULE 1
+#define CONFIG_BRIDGE_EBT_MARK_MODULE 1
+#define CONFIG_BRIDGE_EBT_PKTTYPE_MODULE 1
+#define CONFIG_BRIDGE_EBT_STP_MODULE 1
+#define CONFIG_BRIDGE_EBT_VLAN_MODULE 1
+#define CONFIG_BRIDGE_EBT_ARPREPLY_MODULE 1
+#define CONFIG_BRIDGE_EBT_DNAT_MODULE 1
+#define CONFIG_BRIDGE_EBT_MARK_T_MODULE 1
+#define CONFIG_BRIDGE_EBT_REDIRECT_MODULE 1
+#define CONFIG_BRIDGE_EBT_SNAT_MODULE 1
+#define CONFIG_BRIDGE_EBT_LOG_MODULE 1
+#define CONFIG_BRIDGE_EBT_ULOG_MODULE 1
 
 /*
- * Plug and Play support
+ * DCCP Configuration (EXPERIMENTAL)
  */
-#define CONFIG_PNP 1
-#undef CONFIG_PNP_DEBUG
+#define CONFIG_IP_DCCP_MODULE 1
+#define CONFIG_INET_DCCP_DIAG_MODULE 1
+#define CONFIG_IP_DCCP_ACKVEC 1
 
 /*
- * Protocols
+ * DCCP CCIDs Configuration (EXPERIMENTAL)
  */
-#define CONFIG_ISAPNP 1
-#undef CONFIG_PNPBIOS
+#define CONFIG_IP_DCCP_CCID2_MODULE 1
+#define CONFIG_IP_DCCP_CCID3_MODULE 1
+#define CONFIG_IP_DCCP_TFRC_LIB_MODULE 1
 
 /*
- * Block devices
+ * DCCP Kernel Hacking
  */
-#define CONFIG_BLK_DEV_FD_MODULE 1
-#undef CONFIG_BLK_DEV_XD
-#undef CONFIG_PARIDE
-#define CONFIG_BLK_CPQ_DA_MODULE 1
-#define CONFIG_BLK_CPQ_CISS_DA_MODULE 1
-#define CONFIG_CISS_SCSI_TAPE 1
-#define CONFIG_BLK_DEV_DAC960_MODULE 1
-#define CONFIG_BLK_DEV_UMEM_MODULE 1
-#define CONFIG_BLK_DEV_LOOP_MODULE 1
-#define CONFIG_BLK_DEV_CRYPTOLOOP_MODULE 1
-#define CONFIG_BLK_DEV_NBD_MODULE 1
-#define CONFIG_BLK_DEV_CARMEL_MODULE 1
-#define CONFIG_BLK_DEV_RAM 1
-#define CONFIG_BLK_DEV_RAM_SIZE 16384
-#define CONFIG_BLK_DEV_INITRD 1
-#define CONFIG_LBD 1
+#undef CONFIG_IP_DCCP_DEBUG
 
 /*
- * ATA/ATAPI/MFM/RLL support
+ * SCTP Configuration (EXPERIMENTAL)
  */
-#define CONFIG_IDE 1
-#define CONFIG_BLK_DEV_IDE 1
+#define CONFIG_IP_SCTP_MODULE 1
+#undef CONFIG_SCTP_DBG_MSG
+#undef CONFIG_SCTP_DBG_OBJCNT
+#undef CONFIG_SCTP_HMAC_NONE
+#undef CONFIG_SCTP_HMAC_SHA1
+#define CONFIG_SCTP_HMAC_MD5 1
 
 /*
- * Please see Documentation/ide.txt for help/info on IDE drives
+ * TIPC Configuration (EXPERIMENTAL)
  */
-#undef CONFIG_BLK_DEV_HD_IDE
-#define CONFIG_BLK_DEV_IDEDISK 1
-#define CONFIG_IDEDISK_MULTI_MODE 1
-#undef CONFIG_IDEDISK_STROKE
-#define CONFIG_BLK_DEV_IDECS_MODULE 1
-#define CONFIG_BLK_DEV_IDECD 1
-#define CONFIG_BLK_DEV_IDETAPE_MODULE 1
-#define CONFIG_BLK_DEV_IDEFLOPPY 1
-#undef CONFIG_BLK_DEV_IDESCSI
-#undef CONFIG_IDE_TASK_IOCTL
-#undef CONFIG_IDE_TASKFILE_IO
+#define CONFIG_TIPC_MODULE 1
+#undef CONFIG_TIPC_ADVANCED
+#undef CONFIG_TIPC_DEBUG
+#define CONFIG_ATM_MODULE 1
+#define CONFIG_ATM_CLIP_MODULE 1
+#undef CONFIG_ATM_CLIP_NO_ICMP
+#define CONFIG_ATM_LANE_MODULE 1
+#undef CONFIG_ATM_MPOA
+#define CONFIG_ATM_BR2684_MODULE 1
+#undef CONFIG_ATM_BR2684_IPFILTER
+#define CONFIG_BRIDGE_MODULE 1
+#define CONFIG_VLAN_8021Q_MODULE 1
+#define CONFIG_DECNET_MODULE 1
+#define CONFIG_DECNET_ROUTER 1
+#define CONFIG_DECNET_ROUTE_FWMARK 1
+#define CONFIG_LLC 1
+#undef CONFIG_LLC2
+#define CONFIG_IPX_MODULE 1
+#undef CONFIG_IPX_INTERN
+#define CONFIG_ATALK_MODULE 1
+#define CONFIG_DEV_APPLETALK 1
+#undef CONFIG_LTPC
+#undef CONFIG_COPS
+#define CONFIG_IPDDP_MODULE 1
+#define CONFIG_IPDDP_ENCAP 1
+#define CONFIG_IPDDP_DECAP 1
+#undef CONFIG_X25
+#undef CONFIG_LAPB
+#define CONFIG_NET_DIVERT 1
+#undef CONFIG_ECONET
+#define CONFIG_WAN_ROUTER_MODULE 1
 
 /*
- * IDE chipset support/bugfixes
+ * QoS and/or fair queueing
  */
-#define CONFIG_IDE_GENERIC 1
-#undef CONFIG_BLK_DEV_CMD640
-#define CONFIG_BLK_DEV_IDEPNP 1
-#define CONFIG_BLK_DEV_IDEPCI 1
-#define CONFIG_IDEPCI_SHARE_IRQ 1
-#undef CONFIG_BLK_DEV_OFFBOARD
-#define CONFIG_BLK_DEV_GENERIC 1
-#undef CONFIG_BLK_DEV_OPTI621
-#define CONFIG_BLK_DEV_RZ1000 1
-#define CONFIG_BLK_DEV_IDEDMA_PCI 1
-#undef CONFIG_BLK_DEV_IDEDMA_FORCED
-#define CONFIG_IDEDMA_PCI_AUTO 1
-#undef CONFIG_IDEDMA_ONLYDISK
-#define CONFIG_BLK_DEV_ADMA 1
-#define CONFIG_BLK_DEV_AEC62XX 1
-#define CONFIG_BLK_DEV_ALI15X3 1
-#undef CONFIG_WDC_ALI15X3
-#define CONFIG_BLK_DEV_AMD74XX 1
-#define CONFIG_BLK_DEV_ATIIXP 1
-#define CONFIG_BLK_DEV_CMD64X 1
-#define CONFIG_BLK_DEV_TRIFLEX 1
-#define CONFIG_BLK_DEV_CY82C693 1
-#define CONFIG_BLK_DEV_CS5520 1
-#define CONFIG_BLK_DEV_CS5530 1
-#define CONFIG_BLK_DEV_HPT34X 1
-#undef CONFIG_HPT34X_AUTODMA
-#define CONFIG_BLK_DEV_HPT366 1
-#undef CONFIG_BLK_DEV_SC1200
-#define CONFIG_BLK_DEV_PIIX 1
-#undef CONFIG_BLK_DEV_NS87415
-#define CONFIG_BLK_DEV_PDC202XX_OLD 1
-#undef CONFIG_PDC202XX_BURST
-#define CONFIG_BLK_DEV_PDC202XX_NEW 1
-#define CONFIG_PDC202XX_FORCE 1
-#define CONFIG_BLK_DEV_SVWKS 1
-#define CONFIG_BLK_DEV_SIIMAGE 1
-#define CONFIG_BLK_DEV_SIS5513 1
-#define CONFIG_BLK_DEV_SLC90E66 1
-#undef CONFIG_BLK_DEV_TRM290
-#define CONFIG_BLK_DEV_VIA82CXXX 1
-#undef CONFIG_IDE_ARM
-#undef CONFIG_IDE_CHIPSETS
-#define CONFIG_BLK_DEV_IDEDMA 1
-#undef CONFIG_IDEDMA_IVB
-#define CONFIG_IDEDMA_AUTO 1
-#undef CONFIG_BLK_DEV_HD
+#define CONFIG_NET_SCHED 1
+#undef CONFIG_NET_SCH_CLK_JIFFIES
+#define CONFIG_NET_SCH_CLK_GETTIMEOFDAY 1
+#undef CONFIG_NET_SCH_CLK_CPU
 
 /*
- * SCSI device support
+ * Queueing/Scheduling
  */
-#define CONFIG_SCSI_MODULE 1
-#define CONFIG_SCSI_PROC_FS 1
+#define CONFIG_NET_SCH_CBQ_MODULE 1
+#define CONFIG_NET_SCH_HTB_MODULE 1
+#define CONFIG_NET_SCH_HFSC_MODULE 1
+#define CONFIG_NET_SCH_ATM_MODULE 1
+#define CONFIG_NET_SCH_PRIO_MODULE 1
+#define CONFIG_NET_SCH_RED_MODULE 1
+#define CONFIG_NET_SCH_SFQ_MODULE 1
+#define CONFIG_NET_SCH_TEQL_MODULE 1
+#define CONFIG_NET_SCH_TBF_MODULE 1
+#define CONFIG_NET_SCH_GRED_MODULE 1
+#define CONFIG_NET_SCH_DSMARK_MODULE 1
+#define CONFIG_NET_SCH_NETEM_MODULE 1
+#define CONFIG_NET_SCH_INGRESS_MODULE 1
 
 /*
- * SCSI support type (disk, tape, CD-ROM)
+ * Classification
  */
-#define CONFIG_BLK_DEV_SD_MODULE 1
-#define CONFIG_CHR_DEV_ST_MODULE 1
-#define CONFIG_CHR_DEV_OSST_MODULE 1
-#define CONFIG_BLK_DEV_SR_MODULE 1
-#define CONFIG_BLK_DEV_SR_VENDOR 1
-#define CONFIG_CHR_DEV_SG_MODULE 1
+#define CONFIG_NET_CLS 1
+#define CONFIG_NET_CLS_BASIC_MODULE 1
+#define CONFIG_NET_CLS_TCINDEX_MODULE 1
+#define CONFIG_NET_CLS_ROUTE4_MODULE 1
+#define CONFIG_NET_CLS_ROUTE 1
+#define CONFIG_NET_CLS_FW_MODULE 1
+#define CONFIG_NET_CLS_U32_MODULE 1
+#define CONFIG_CLS_U32_PERF 1
+#define CONFIG_CLS_U32_MARK 1
+#define CONFIG_NET_CLS_RSVP_MODULE 1
+#define CONFIG_NET_CLS_RSVP6_MODULE 1
+#define CONFIG_NET_EMATCH 1
+#define CONFIG_NET_EMATCH_STACK 32
+#define CONFIG_NET_EMATCH_CMP_MODULE 1
+#define CONFIG_NET_EMATCH_NBYTE_MODULE 1
+#define CONFIG_NET_EMATCH_U32_MODULE 1
+#define CONFIG_NET_EMATCH_META_MODULE 1
+#define CONFIG_NET_EMATCH_TEXT_MODULE 1
+#undef CONFIG_NET_CLS_ACT
+#define CONFIG_NET_CLS_POLICE 1
+#define CONFIG_NET_CLS_IND 1
+#define CONFIG_NET_ESTIMATOR 1
 
 /*
- * Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+ * Network testing
  */
-#undef CONFIG_SCSI_MULTI_LUN
-#define CONFIG_SCSI_CONSTANTS 1
-#define CONFIG_SCSI_LOGGING 1
+#define CONFIG_NET_PKTGEN_MODULE 1
+#undef CONFIG_HAMRADIO
+#define CONFIG_IRDA_MODULE 1
 
 /*
- * SCSI Transport Attributes
+ * IrDA protocols
  */
-#define CONFIG_SCSI_SPI_ATTRS_MODULE 1
-#define CONFIG_SCSI_FC_ATTRS_MODULE 1
+#define CONFIG_IRLAN_MODULE 1
+#define CONFIG_IRNET_MODULE 1
+#define CONFIG_IRCOMM_MODULE 1
+#undef CONFIG_IRDA_ULTRA
 
 /*
- * SCSI low-level drivers
+ * IrDA options
  */
-#define CONFIG_BLK_DEV_3W_XXXX_RAID_MODULE 1
-#undef CONFIG_SCSI_7000FASST
-#define CONFIG_SCSI_ACARD_MODULE 1
-#define CONFIG_SCSI_AHA152X_MODULE 1
-#define CONFIG_SCSI_AHA1542_MODULE 1
-#define CONFIG_SCSI_AACRAID_MODULE 1
-#define CONFIG_SCSI_AIC7XXX_MODULE 1
-#define CONFIG_AIC7XXX_CMDS_PER_DEVICE 4
-#define CONFIG_AIC7XXX_RESET_DELAY_MS 15000
-#undef CONFIG_AIC7XXX_BUILD_FIRMWARE
-#undef CONFIG_AIC7XXX_DEBUG_ENABLE
-#define CONFIG_AIC7XXX_DEBUG_MASK 0
-#undef CONFIG_AIC7XXX_REG_PRETTY_PRINT
-#define CONFIG_SCSI_AIC7XXX_OLD_MODULE 1
-#define CONFIG_SCSI_AIC79XX_MODULE 1
-#define CONFIG_AIC79XX_CMDS_PER_DEVICE 4
-#define CONFIG_AIC79XX_RESET_DELAY_MS 15000
-#undef CONFIG_AIC79XX_BUILD_FIRMWARE
-#undef CONFIG_AIC79XX_ENABLE_RD_STRM
-#undef CONFIG_AIC79XX_DEBUG_ENABLE
-#define CONFIG_AIC79XX_DEBUG_MASK 0
-#undef CONFIG_AIC79XX_REG_PRETTY_PRINT
-#undef CONFIG_SCSI_DPT_I2O
-#define CONFIG_SCSI_ADVANSYS_MODULE 1
-#define CONFIG_SCSI_IN2000_MODULE 1
-#define CONFIG_SCSI_MEGARAID_MODULE 1
-#define CONFIG_SCSI_SATA 1
-#define CONFIG_SCSI_SATA_SVW_MODULE 1
-#define CONFIG_SCSI_ATA_PIIX_MODULE 1
-#define CONFIG_SCSI_SATA_PROMISE_MODULE 1
-#define CONFIG_SCSI_SATA_SX4_MODULE 1
-#define CONFIG_SCSI_SATA_SIL_MODULE 1
-#define CONFIG_SCSI_SATA_SIS_MODULE 1
-#define CONFIG_SCSI_SATA_VIA_MODULE 1
-#define CONFIG_SCSI_SATA_VITESSE_MODULE 1
-#define CONFIG_SCSI_BUSLOGIC_MODULE 1
-#undef CONFIG_SCSI_OMIT_FLASHPOINT
-#undef CONFIG_SCSI_CPQFCTS
-#undef CONFIG_SCSI_DMX3191D
-#undef CONFIG_SCSI_DTC3280
-#undef CONFIG_SCSI_EATA
-#undef CONFIG_SCSI_EATA_PIO
-#define CONFIG_SCSI_FUTURE_DOMAIN_MODULE 1
-#define CONFIG_SCSI_GDTH_MODULE 1
-#undef CONFIG_SCSI_GENERIC_NCR5380
-#undef CONFIG_SCSI_GENERIC_NCR5380_MMIO
-#define CONFIG_SCSI_IPS_MODULE 1
-#define CONFIG_SCSI_INIA100_MODULE 1
-#define CONFIG_SCSI_PPA_MODULE 1
-#define CONFIG_SCSI_IMM_MODULE 1
-#undef CONFIG_SCSI_IZIP_EPP16
-#undef CONFIG_SCSI_IZIP_SLOW_CTR
-#undef CONFIG_SCSI_NCR53C406A
-#define CONFIG_SCSI_SYM53C8XX_2_MODULE 1
-#define CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE 1
-#define CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS 16
-#define CONFIG_SCSI_SYM53C8XX_MAX_TAGS 64
-#undef CONFIG_SCSI_SYM53C8XX_IOMAPPED
-#undef CONFIG_SCSI_IPR
-#undef CONFIG_SCSI_PAS16
-#undef CONFIG_SCSI_PSI240I
-#define CONFIG_SCSI_QLOGIC_FAS_MODULE 1
-#define CONFIG_SCSI_QLOGIC_ISP_MODULE 1
-#undef CONFIG_SCSI_QLOGIC_FC
-#define CONFIG_SCSI_QLOGIC_1280_MODULE 1
-#define CONFIG_SCSI_QLA2XXX_MODULE 1
-#define CONFIG_SCSI_QLA21XX_MODULE 1
-#define CONFIG_SCSI_QLA22XX_MODULE 1
-#define CONFIG_SCSI_QLA2300_MODULE 1
-#define CONFIG_SCSI_QLA2322_MODULE 1
-#define CONFIG_SCSI_QLA6312_MODULE 1
-#define CONFIG_SCSI_QLA6322_MODULE 1
-#undef CONFIG_SCSI_SYM53C416
-#undef CONFIG_SCSI_DC395x
-#define CONFIG_SCSI_DC390T_MODULE 1
-#undef CONFIG_SCSI_T128
-#undef CONFIG_SCSI_U14_34F
-#undef CONFIG_SCSI_ULTRASTOR
-#undef CONFIG_SCSI_NSP32
-#undef CONFIG_SCSI_DEBUG
+#define CONFIG_IRDA_CACHE_LAST_LSAP 1
+#define CONFIG_IRDA_FAST_RR 1
+#undef CONFIG_IRDA_DEBUG
 
 /*
- * PCMCIA SCSI adapter support
+ * Infrared-port device drivers
  */
-#define CONFIG_PCMCIA_AHA152X_MODULE 1
-#define CONFIG_PCMCIA_FDOMAIN_MODULE 1
-#define CONFIG_PCMCIA_NINJA_SCSI_MODULE 1
-#define CONFIG_PCMCIA_QLOGIC_MODULE 1
-#define CONFIG_PCMCIA_SYM53C500_MODULE 1
 
 /*
- * Old CD-ROM drivers (not SCSI, not IDE)
+ * SIR device drivers
  */
-#undef CONFIG_CD_NO_IDESCSI
+#define CONFIG_IRTTY_SIR_MODULE 1
 
 /*
- * Multi-device support (RAID and LVM)
+ * Dongle support
  */
-#define CONFIG_MD 1
-#define CONFIG_BLK_DEV_MD 1
-#define CONFIG_MD_LINEAR_MODULE 1
-#define CONFIG_MD_RAID0_MODULE 1
-#define CONFIG_MD_RAID1_MODULE 1
-#define CONFIG_MD_RAID5_MODULE 1
-#define CONFIG_MD_RAID6_MODULE 1
-#define CONFIG_MD_MULTIPATH_MODULE 1
-#define CONFIG_BLK_DEV_DM_MODULE 1
-#define CONFIG_DM_CRYPT_MODULE 1
+#define CONFIG_DONGLE 1
+#define CONFIG_ESI_DONGLE_MODULE 1
+#define CONFIG_ACTISYS_DONGLE_MODULE 1
+#define CONFIG_TEKRAM_DONGLE_MODULE 1
+#define CONFIG_TOIM3232_DONGLE_MODULE 1
+#define CONFIG_LITELINK_DONGLE_MODULE 1
+#define CONFIG_MA600_DONGLE_MODULE 1
+#define CONFIG_GIRBIL_DONGLE_MODULE 1
+#define CONFIG_MCP2120_DONGLE_MODULE 1
+#define CONFIG_OLD_BELKIN_DONGLE_MODULE 1
+#define CONFIG_ACT200L_DONGLE_MODULE 1
 
 /*
- * Fusion MPT device support
+ * Old SIR device drivers
  */
-#define CONFIG_FUSION_MODULE 1
-#define CONFIG_FUSION_MAX_SGE 40
-#undef CONFIG_FUSION_ISENSE
-#define CONFIG_FUSION_CTL_MODULE 1
-#define CONFIG_FUSION_LAN_MODULE 1
+#define CONFIG_IRPORT_SIR_MODULE 1
 
 /*
- * IEEE 1394 (FireWire) support
+ * Old Serial dongle support
  */
-#define CONFIG_IEEE1394_MODULE 1
+#undef CONFIG_DONGLE_OLD
 
 /*
- * Subsystem Options
+ * FIR device drivers
  */
-#undef CONFIG_IEEE1394_VERBOSEDEBUG
-#define CONFIG_IEEE1394_OUI_DB 1
-#undef CONFIG_IEEE1394_EXTRA_CONFIG_ROMS
+#define CONFIG_USB_IRDA_MODULE 1
+#define CONFIG_SIGMATEL_FIR_MODULE 1
+#define CONFIG_NSC_FIR_MODULE 1
+#define CONFIG_WINBOND_FIR_MODULE 1
+#define CONFIG_TOSHIBA_FIR_MODULE 1
+#define CONFIG_SMC_IRCC_FIR_MODULE 1
+#define CONFIG_ALI_FIR_MODULE 1
+#define CONFIG_VLSI_FIR_MODULE 1
+#define CONFIG_VIA_FIR_MODULE 1
+#define CONFIG_BT_MODULE 1
+#define CONFIG_BT_L2CAP_MODULE 1
+#define CONFIG_BT_SCO_MODULE 1
+#define CONFIG_BT_RFCOMM_MODULE 1
+#define CONFIG_BT_RFCOMM_TTY 1
+#define CONFIG_BT_BNEP_MODULE 1
+#define CONFIG_BT_BNEP_MC_FILTER 1
+#define CONFIG_BT_BNEP_PROTO_FILTER 1
+#define CONFIG_BT_CMTP_MODULE 1
+#define CONFIG_BT_HIDP_MODULE 1
 
 /*
- * Device Drivers
+ * Bluetooth device drivers
  */
-#undef CONFIG_IEEE1394_PCILYNX
-#define CONFIG_IEEE1394_OHCI1394_MODULE 1
+#define CONFIG_BT_HCIUSB_MODULE 1
+#define CONFIG_BT_HCIUSB_SCO 1
+#define CONFIG_BT_HCIUART_MODULE 1
+#define CONFIG_BT_HCIUART_H4 1
+#define CONFIG_BT_HCIUART_BCSP 1
+#define CONFIG_BT_HCIBCM203X_MODULE 1
+#define CONFIG_BT_HCIBPA10X_MODULE 1
+#define CONFIG_BT_HCIBFUSB_MODULE 1
+#define CONFIG_BT_HCIDTL1_MODULE 1
+#define CONFIG_BT_HCIBT3C_MODULE 1
+#define CONFIG_BT_HCIBLUECARD_MODULE 1
+#define CONFIG_BT_HCIBTUART_MODULE 1
+#define CONFIG_BT_HCIVHCI_MODULE 1
+#define CONFIG_IEEE80211_MODULE 1
+#undef CONFIG_IEEE80211_DEBUG
+#define CONFIG_IEEE80211_CRYPT_WEP_MODULE 1
+#define CONFIG_IEEE80211_CRYPT_CCMP_MODULE 1
+#define CONFIG_IEEE80211_CRYPT_TKIP_MODULE 1
+#define CONFIG_IEEE80211_SOFTMAC_MODULE 1
+#define CONFIG_IEEE80211_SOFTMAC_DEBUG 1
+#define CONFIG_TUX_MODULE 1
 
 /*
- * Protocol Drivers
+ * TUX options
  */
-#define CONFIG_IEEE1394_VIDEO1394_MODULE 1
-#define CONFIG_IEEE1394_SBP2_MODULE 1
-#undef CONFIG_IEEE1394_SBP2_PHYS_DMA
-#undef CONFIG_IEEE1394_ETH1394
-#define CONFIG_IEEE1394_DV1394_MODULE 1
-#define CONFIG_IEEE1394_RAWIO_MODULE 1
-#define CONFIG_IEEE1394_CMP_MODULE 1
-#define CONFIG_IEEE1394_AMDTP_MODULE 1
+#define CONFIG_TUX_EXTCGI 1
+#define CONFIG_TUX_EXTENDED_LOG 1
+#undef CONFIG_TUX_DEBUG
+#define CONFIG_WIRELESS_EXT 1
 
 /*
- * I2O device support
+ * Device Drivers
  */
-#define CONFIG_I2O_MODULE 1
-#define CONFIG_I2O_CONFIG_MODULE 1
-#define CONFIG_I2O_BLOCK_MODULE 1
-#define CONFIG_I2O_SCSI_MODULE 1
-#define CONFIG_I2O_PROC_MODULE 1
 
 /*
- * Networking support
+ * Generic Driver Options
  */
-#define CONFIG_NET 1
+#define CONFIG_STANDALONE 1
+#define CONFIG_PREVENT_FIRMWARE_BUILD 1
+#define CONFIG_FW_LOADER 1
+#undef CONFIG_DEBUG_DRIVER
 
 /*
- * Networking options
+ * Connector - unified userspace <-> kernelspace linker
  */
-#define CONFIG_PACKET 1
-#define CONFIG_PACKET_MMAP 1
-#define CONFIG_NETLINK_DEV 1
-#define CONFIG_UNIX 1
-#define CONFIG_NET_KEY_MODULE 1
-#define CONFIG_INET 1
-#define CONFIG_IP_MULTICAST 1
-#define CONFIG_IP_ADVANCED_ROUTER 1
-#define CONFIG_IP_MULTIPLE_TABLES 1
-#define CONFIG_IP_ROUTE_FWMARK 1
-#define CONFIG_IP_ROUTE_NAT 1
-#define CONFIG_IP_ROUTE_MULTIPATH 1
-#define CONFIG_IP_ROUTE_TOS 1
-#define CONFIG_IP_ROUTE_VERBOSE 1
-#undef CONFIG_IP_PNP
-#define CONFIG_NET_IPIP_MODULE 1
-#define CONFIG_NET_IPGRE_MODULE 1
-#define CONFIG_NET_IPGRE_BROADCAST 1
-#define CONFIG_IP_MROUTE 1
-#define CONFIG_IP_PIMSM_V1 1
-#define CONFIG_IP_PIMSM_V2 1
-#undef CONFIG_ARPD
-#define CONFIG_SYN_COOKIES 1
-#define CONFIG_INET_AH_MODULE 1
-#define CONFIG_INET_ESP_MODULE 1
-#define CONFIG_INET_IPCOMP_MODULE 1
+#define CONFIG_CONNECTOR_MODULE 1
 
 /*
- * IP: Virtual Server Configuration
+ * Memory Technology Devices (MTD)
  */
-#define CONFIG_IP_VS_MODULE 1
-#undef CONFIG_IP_VS_DEBUG
-#define CONFIG_IP_VS_TAB_BITS 12
+#define CONFIG_MTD_MODULE 1
+#undef CONFIG_MTD_DEBUG
+#define CONFIG_MTD_CONCAT_MODULE 1
+#define CONFIG_MTD_PARTITIONS 1
+#define CONFIG_MTD_REDBOOT_PARTS_MODULE 1
+#define CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK -1
+#undef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
+#undef CONFIG_MTD_REDBOOT_PARTS_READONLY
+#define CONFIG_MTD_CMDLINE_PARTS 1
 
 /*
- * IPVS transport protocol load balancing support
+ * User Modules And Translation Layers
  */
-#define CONFIG_IP_VS_PROTO_TCP 1
-#define CONFIG_IP_VS_PROTO_UDP 1
-#define CONFIG_IP_VS_PROTO_ESP 1
-#define CONFIG_IP_VS_PROTO_AH 1
+#define CONFIG_MTD_CHAR_MODULE 1
+#define CONFIG_MTD_BLOCK_MODULE 1
+#define CONFIG_MTD_BLOCK_RO_MODULE 1
+#define CONFIG_FTL_MODULE 1
+#define CONFIG_NFTL_MODULE 1
+#define CONFIG_NFTL_RW 1
+#define CONFIG_INFTL_MODULE 1
+#define CONFIG_RFD_FTL_MODULE 1
 
 /*
- * IPVS scheduler
+ * RAM/ROM/Flash chip drivers
  */
-#define CONFIG_IP_VS_RR_MODULE 1
-#define CONFIG_IP_VS_WRR_MODULE 1
-#define CONFIG_IP_VS_LC_MODULE 1
-#define CONFIG_IP_VS_WLC_MODULE 1
-#define CONFIG_IP_VS_LBLC_MODULE 1
-#define CONFIG_IP_VS_LBLCR_MODULE 1
-#define CONFIG_IP_VS_DH_MODULE 1
-#define CONFIG_IP_VS_SH_MODULE 1
-#define CONFIG_IP_VS_SED_MODULE 1
-#define CONFIG_IP_VS_NQ_MODULE 1
+#define CONFIG_MTD_CFI_MODULE 1
+#define CONFIG_MTD_JEDECPROBE_MODULE 1
+#define CONFIG_MTD_GEN_PROBE_MODULE 1
+#undef CONFIG_MTD_CFI_ADV_OPTIONS
+#define CONFIG_MTD_MAP_BANK_WIDTH_1 1
+#define CONFIG_MTD_MAP_BANK_WIDTH_2 1
+#define CONFIG_MTD_MAP_BANK_WIDTH_4 1
+#undef CONFIG_MTD_MAP_BANK_WIDTH_8
+#undef CONFIG_MTD_MAP_BANK_WIDTH_16
+#undef CONFIG_MTD_MAP_BANK_WIDTH_32
+#define CONFIG_MTD_CFI_I1 1
+#define CONFIG_MTD_CFI_I2 1
+#undef CONFIG_MTD_CFI_I4
+#undef CONFIG_MTD_CFI_I8
+#define CONFIG_MTD_CFI_INTELEXT_MODULE 1
+#define CONFIG_MTD_CFI_AMDSTD_MODULE 1
+#define CONFIG_MTD_CFI_STAA_MODULE 1
+#define CONFIG_MTD_CFI_UTIL_MODULE 1
+#define CONFIG_MTD_RAM_MODULE 1
+#define CONFIG_MTD_ROM_MODULE 1
+#define CONFIG_MTD_ABSENT_MODULE 1
+#undef CONFIG_MTD_OBSOLETE_CHIPS
 
 /*
- * IPVS application helper
+ * Mapping drivers for chip access
  */
-#define CONFIG_IP_VS_FTP_MODULE 1
-#define CONFIG_IPV6_MODULE 1
-#define CONFIG_IPV6_PRIVACY 1
-#define CONFIG_INET6_AH_MODULE 1
-#define CONFIG_INET6_ESP_MODULE 1
-#define CONFIG_INET6_IPCOMP_MODULE 1
-#define CONFIG_IPV6_TUNNEL_MODULE 1
-#define CONFIG_NETFILTER 1
-#undef CONFIG_NETFILTER_DEBUG
-#define CONFIG_BRIDGE_NETFILTER 1
+#define CONFIG_MTD_COMPLEX_MAPPINGS 1
+#undef CONFIG_MTD_PHYSMAP
+#undef CONFIG_MTD_PNC2000
+#define CONFIG_MTD_SC520CDP_MODULE 1
+#define CONFIG_MTD_NETSC520_MODULE 1
+#define CONFIG_MTD_TS5500_MODULE 1
+#undef CONFIG_MTD_SBC_GXX
+#undef CONFIG_MTD_AMD76XROM
+#undef CONFIG_MTD_ICHXROM
+#define CONFIG_MTD_SCB2_FLASH_MODULE 1
+#undef CONFIG_MTD_NETtel
+#undef CONFIG_MTD_DILNETPC
+#undef CONFIG_MTD_L440GX
+#define CONFIG_MTD_PCI_MODULE 1
+#undef CONFIG_MTD_PLATRAM
 
 /*
- * IP: Netfilter Configuration
+ * Self-contained MTD device drivers
  */
-#define CONFIG_IP_NF_CONNTRACK_MODULE 1
-#define CONFIG_IP_NF_FTP_MODULE 1
-#define CONFIG_IP_NF_IRC_MODULE 1
-#define CONFIG_IP_NF_TFTP_MODULE 1
-#define CONFIG_IP_NF_AMANDA_MODULE 1
-#define CONFIG_IP_NF_QUEUE_MODULE 1
-#define CONFIG_IP_NF_IPTABLES_MODULE 1
-#define CONFIG_IP_NF_MATCH_LIMIT_MODULE 1
-#define CONFIG_IP_NF_MATCH_IPRANGE_MODULE 1
-#define CONFIG_IP_NF_MATCH_MAC_MODULE 1
-#define CONFIG_IP_NF_MATCH_PKTTYPE_MODULE 1
-#define CONFIG_IP_NF_MATCH_MARK_MODULE 1
-#define CONFIG_IP_NF_MATCH_MULTIPORT_MODULE 1
-#define CONFIG_IP_NF_MATCH_TOS_MODULE 1
-#define CONFIG_IP_NF_MATCH_RECENT_MODULE 1
-#define CONFIG_IP_NF_MATCH_ECN_MODULE 1
-#define CONFIG_IP_NF_MATCH_DSCP_MODULE 1
-#define CONFIG_IP_NF_MATCH_AH_ESP_MODULE 1
-#define CONFIG_IP_NF_MATCH_LENGTH_MODULE 1
-#define CONFIG_IP_NF_MATCH_TTL_MODULE 1
-#define CONFIG_IP_NF_MATCH_TCPMSS_MODULE 1
-#define CONFIG_IP_NF_MATCH_HELPER_MODULE 1
-#define CONFIG_IP_NF_MATCH_STATE_MODULE 1
-#define CONFIG_IP_NF_MATCH_CONNTRACK_MODULE 1
-#define CONFIG_IP_NF_MATCH_OWNER_MODULE 1
-#define CONFIG_IP_NF_MATCH_PHYSDEV_MODULE 1
-#define CONFIG_IP_NF_FILTER_MODULE 1
-#define CONFIG_IP_NF_TARGET_REJECT_MODULE 1
-#define CONFIG_IP_NF_NAT_MODULE 1
-#define CONFIG_IP_NF_NAT_NEEDED 1
-#define CONFIG_IP_NF_TARGET_MASQUERADE_MODULE 1
-#define CONFIG_IP_NF_TARGET_REDIRECT_MODULE 1
-#define CONFIG_IP_NF_TARGET_NETMAP_MODULE 1
-#define CONFIG_IP_NF_TARGET_SAME_MODULE 1
-#define CONFIG_IP_NF_NAT_LOCAL 1
-#define CONFIG_IP_NF_NAT_SNMP_BASIC_MODULE 1
-#define CONFIG_IP_NF_NAT_IRC_MODULE 1
-#define CONFIG_IP_NF_NAT_FTP_MODULE 1
-#define CONFIG_IP_NF_NAT_TFTP_MODULE 1
-#define CONFIG_IP_NF_NAT_AMANDA_MODULE 1
-#define CONFIG_IP_NF_MANGLE_MODULE 1
-#define CONFIG_IP_NF_TARGET_TOS_MODULE 1
-#define CONFIG_IP_NF_TARGET_ECN_MODULE 1
-#define CONFIG_IP_NF_TARGET_DSCP_MODULE 1
-#define CONFIG_IP_NF_TARGET_MARK_MODULE 1
-#define CONFIG_IP_NF_TARGET_CLASSIFY_MODULE 1
-#define CONFIG_IP_NF_TARGET_LOG_MODULE 1
-#define CONFIG_IP_NF_TARGET_ULOG_MODULE 1
-#define CONFIG_IP_NF_TARGET_TCPMSS_MODULE 1
-#define CONFIG_IP_NF_ARPTABLES_MODULE 1
-#define CONFIG_IP_NF_ARPFILTER_MODULE 1
-#define CONFIG_IP_NF_ARP_MANGLE_MODULE 1
-#undef CONFIG_IP_NF_COMPAT_IPCHAINS
-#undef CONFIG_IP_NF_COMPAT_IPFWADM
-#define CONFIG_IP_NF_TARGET_NOTRACK_MODULE 1
-#define CONFIG_IP_NF_RAW_MODULE 1
+#define CONFIG_MTD_PMC551_MODULE 1
+#undef CONFIG_MTD_PMC551_BUGFIX
+#undef CONFIG_MTD_PMC551_DEBUG
+#undef CONFIG_MTD_SLRAM
+#undef CONFIG_MTD_PHRAM
+#define CONFIG_MTD_MTDRAM_MODULE 1
+#define CONFIG_MTDRAM_TOTAL_SIZE 4096
+#define CONFIG_MTDRAM_ERASE_SIZE 128
+#define CONFIG_MTD_BLOCK2MTD_MODULE 1
 
 /*
- * IPv6: Netfilter Configuration
+ * Disk-On-Chip Device Drivers
  */
-#undef CONFIG_IP6_NF_QUEUE
-#define CONFIG_IP6_NF_IPTABLES_MODULE 1
-#define CONFIG_IP6_NF_MATCH_LIMIT_MODULE 1
-#define CONFIG_IP6_NF_MATCH_MAC_MODULE 1
-#define CONFIG_IP6_NF_MATCH_RT_MODULE 1
-#define CONFIG_IP6_NF_MATCH_OPTS_MODULE 1
-#define CONFIG_IP6_NF_MATCH_FRAG_MODULE 1
-#define CONFIG_IP6_NF_MATCH_HL_MODULE 1
-#define CONFIG_IP6_NF_MATCH_MULTIPORT_MODULE 1
-#define CONFIG_IP6_NF_MATCH_OWNER_MODULE 1
-#define CONFIG_IP6_NF_MATCH_MARK_MODULE 1
-#define CONFIG_IP6_NF_MATCH_IPV6HEADER_MODULE 1
-#define CONFIG_IP6_NF_MATCH_AHESP_MODULE 1
-#define CONFIG_IP6_NF_MATCH_LENGTH_MODULE 1
-#define CONFIG_IP6_NF_MATCH_EUI64_MODULE 1
-#define CONFIG_IP6_NF_FILTER_MODULE 1
-#define CONFIG_IP6_NF_TARGET_LOG_MODULE 1
-#define CONFIG_IP6_NF_MANGLE_MODULE 1
-#define CONFIG_IP6_NF_TARGET_MARK_MODULE 1
-#define CONFIG_IP6_NF_RAW_MODULE 1
+#define CONFIG_MTD_DOC2000_MODULE 1
+#undef CONFIG_MTD_DOC2001
+#define CONFIG_MTD_DOC2001PLUS_MODULE 1
+#define CONFIG_MTD_DOCPROBE_MODULE 1
+#define CONFIG_MTD_DOCECC_MODULE 1
+#undef CONFIG_MTD_DOCPROBE_ADVANCED
+#define CONFIG_MTD_DOCPROBE_ADDRESS 0x0
+
+/*
+ * NAND Flash Device Drivers
+ */
+#define CONFIG_MTD_NAND_MODULE 1
+#undef CONFIG_MTD_NAND_VERIFY_WRITE
+#define CONFIG_MTD_NAND_IDS_MODULE 1
+#undef CONFIG_MTD_NAND_DISKONCHIP
+#define CONFIG_MTD_NAND_NANDSIM_MODULE 1
+
+/*
+ * OneNAND Flash Device Drivers
+ */
+#undef CONFIG_MTD_ONENAND
+
+/*
+ * Parallel port support
+ */
+#define CONFIG_PARPORT_MODULE 1
+#define CONFIG_PARPORT_PC_MODULE 1
+#define CONFIG_PARPORT_SERIAL_MODULE 1
+#undef CONFIG_PARPORT_PC_FIFO
+#undef CONFIG_PARPORT_PC_SUPERIO
+#define CONFIG_PARPORT_PC_PCMCIA_MODULE 1
+#define CONFIG_PARPORT_NOT_PC 1
+#undef CONFIG_PARPORT_GSC
+#define CONFIG_PARPORT_1284 1
+
+/*
+ * Plug and Play support
+ */
+#define CONFIG_PNP 1
+#undef CONFIG_PNP_DEBUG
+
+/*
+ * Protocols
+ */
+#define CONFIG_ISAPNP 1
+#undef CONFIG_PNPBIOS
+#define CONFIG_PNPACPI 1
+
+/*
+ * Block devices
+ */
+#define CONFIG_BLK_DEV_FD_MODULE 1
+#undef CONFIG_BLK_DEV_XD
+#define CONFIG_PARIDE_MODULE 1
+#define CONFIG_PARIDE_PARPORT_MODULE 1
+
+/*
+ * Parallel IDE high-level drivers
+ */
+#define CONFIG_PARIDE_PD_MODULE 1
+#define CONFIG_PARIDE_PCD_MODULE 1
+#define CONFIG_PARIDE_PF_MODULE 1
+#define CONFIG_PARIDE_PT_MODULE 1
+#define CONFIG_PARIDE_PG_MODULE 1
+
+/*
+ * Parallel IDE protocol modules
+ */
+#define CONFIG_PARIDE_ATEN_MODULE 1
+#define CONFIG_PARIDE_BPCK_MODULE 1
+#define CONFIG_PARIDE_BPCK6_MODULE 1
+#define CONFIG_PARIDE_COMM_MODULE 1
+#define CONFIG_PARIDE_DSTR_MODULE 1
+#define CONFIG_PARIDE_FIT2_MODULE 1
+#define CONFIG_PARIDE_FIT3_MODULE 1
+#define CONFIG_PARIDE_EPAT_MODULE 1
+#define CONFIG_PARIDE_EPATC8 1
+#define CONFIG_PARIDE_EPIA_MODULE 1
+#define CONFIG_PARIDE_FRIQ_MODULE 1
+#define CONFIG_PARIDE_FRPW_MODULE 1
+#define CONFIG_PARIDE_KBIC_MODULE 1
+#define CONFIG_PARIDE_KTTI_MODULE 1
+#define CONFIG_PARIDE_ON20_MODULE 1
+#define CONFIG_PARIDE_ON26_MODULE 1
+#define CONFIG_BLK_CPQ_DA_MODULE 1
+#define CONFIG_BLK_CPQ_CISS_DA_MODULE 1
+#define CONFIG_CISS_SCSI_TAPE 1
+#define CONFIG_BLK_DEV_DAC960_MODULE 1
+#define CONFIG_BLK_DEV_UMEM_MODULE 1
+#undef CONFIG_BLK_DEV_COW_COMMON
+#define CONFIG_BLK_DEV_LOOP_MODULE 1
+#define CONFIG_BLK_DEV_CRYPTOLOOP_MODULE 1
+#define CONFIG_BLK_DEV_NBD_MODULE 1
+#define CONFIG_BLK_DEV_SX8_MODULE 1
+#define CONFIG_BLK_DEV_UB_MODULE 1
+#define CONFIG_BLK_DEV_RAM 1
+#define CONFIG_BLK_DEV_RAM_COUNT 16
+#define CONFIG_BLK_DEV_RAM_SIZE 16384
+#define CONFIG_BLK_DEV_INITRD 1
+#define CONFIG_CDROM_PKTCDVD_MODULE 1
+#define CONFIG_CDROM_PKTCDVD_BUFFERS 8
+#undef CONFIG_CDROM_PKTCDVD_WCACHE
+#define CONFIG_ATA_OVER_ETH_MODULE 1
+
+/*
+ * ATA/ATAPI/MFM/RLL support
+ */
+#define CONFIG_IDE 1
+#define CONFIG_BLK_DEV_IDE 1
+
+/*
+ * Please see Documentation/ide.txt for help/info on IDE drives
+ */
+#undef CONFIG_BLK_DEV_IDE_SATA
+#undef CONFIG_BLK_DEV_HD_IDE
+#define CONFIG_BLK_DEV_IDEDISK 1
+#define CONFIG_IDEDISK_MULTI_MODE 1
+#define CONFIG_BLK_DEV_IDECS_MODULE 1
+#define CONFIG_BLK_DEV_IDECD 1
+#undef CONFIG_BLK_DEV_IDETAPE
+#define CONFIG_BLK_DEV_IDEFLOPPY 1
+#define CONFIG_BLK_DEV_IDESCSI_MODULE 1
+#define CONFIG_IDE_TASK_IOCTL 1
+
+/*
+ * IDE chipset support/bugfixes
+ */
+#define CONFIG_IDE_GENERIC 1
+#define CONFIG_BLK_DEV_CMD640 1
+#define CONFIG_BLK_DEV_CMD640_ENHANCED 1
+#define CONFIG_BLK_DEV_IDEPNP 1
+#define CONFIG_BLK_DEV_IDEPCI 1
+#define CONFIG_IDEPCI_SHARE_IRQ 1
+#undef CONFIG_BLK_DEV_OFFBOARD
+#define CONFIG_BLK_DEV_GENERIC 1
+#undef CONFIG_BLK_DEV_OPTI621
+#define CONFIG_BLK_DEV_RZ1000 1
+#define CONFIG_BLK_DEV_IDEDMA_PCI 1
+#undef CONFIG_BLK_DEV_IDEDMA_FORCED
+#define CONFIG_IDEDMA_PCI_AUTO 1
+#undef CONFIG_IDEDMA_ONLYDISK
+#define CONFIG_BLK_DEV_AEC62XX 1
+#define CONFIG_BLK_DEV_ALI15X3 1
+#undef CONFIG_WDC_ALI15X3
+#define CONFIG_BLK_DEV_AMD74XX 1
+#define CONFIG_BLK_DEV_ATIIXP 1
+#define CONFIG_BLK_DEV_CMD64X 1
+#define CONFIG_BLK_DEV_TRIFLEX 1
+#define CONFIG_BLK_DEV_CY82C693 1
+#define CONFIG_BLK_DEV_CS5520 1
+#define CONFIG_BLK_DEV_CS5530 1
+#define CONFIG_BLK_DEV_CS5535 1
+#define CONFIG_BLK_DEV_HPT34X 1
+#undef CONFIG_HPT34X_AUTODMA
+#define CONFIG_BLK_DEV_HPT366 1
+#undef CONFIG_BLK_DEV_SC1200
+#define CONFIG_BLK_DEV_PIIX 1
+#define CONFIG_BLK_DEV_IT821X 1
+#undef CONFIG_BLK_DEV_NS87415
+#define CONFIG_BLK_DEV_PDC202XX_OLD 1
+#undef CONFIG_PDC202XX_BURST
+#define CONFIG_BLK_DEV_PDC202XX_NEW 1
+#define CONFIG_BLK_DEV_SVWKS 1
+#define CONFIG_BLK_DEV_SIIMAGE 1
+#define CONFIG_BLK_DEV_SIS5513 1
+#define CONFIG_BLK_DEV_SLC90E66 1
+#undef CONFIG_BLK_DEV_TRM290
+#define CONFIG_BLK_DEV_VIA82CXXX 1
+#undef CONFIG_IDE_ARM
+#undef CONFIG_IDE_CHIPSETS
+#define CONFIG_BLK_DEV_IDEDMA 1
+#undef CONFIG_IDEDMA_IVB
+#define CONFIG_IDEDMA_AUTO 1
+#undef CONFIG_BLK_DEV_HD
 
 /*
- * Bridge: Netfilter Configuration
+ * SCSI device support
  */
-#define CONFIG_BRIDGE_NF_EBTABLES_MODULE 1
-#define CONFIG_BRIDGE_EBT_BROUTE_MODULE 1
-#define CONFIG_BRIDGE_EBT_T_FILTER_MODULE 1
-#define CONFIG_BRIDGE_EBT_T_NAT_MODULE 1
-#define CONFIG_BRIDGE_EBT_802_3_MODULE 1
-#define CONFIG_BRIDGE_EBT_AMONG_MODULE 1
-#define CONFIG_BRIDGE_EBT_ARP_MODULE 1
-#define CONFIG_BRIDGE_EBT_IP_MODULE 1
-#define CONFIG_BRIDGE_EBT_LIMIT_MODULE 1
-#define CONFIG_BRIDGE_EBT_MARK_MODULE 1
-#define CONFIG_BRIDGE_EBT_PKTTYPE_MODULE 1
-#define CONFIG_BRIDGE_EBT_STP_MODULE 1
-#define CONFIG_BRIDGE_EBT_VLAN_MODULE 1
-#define CONFIG_BRIDGE_EBT_ARPREPLY_MODULE 1
-#define CONFIG_BRIDGE_EBT_DNAT_MODULE 1
-#define CONFIG_BRIDGE_EBT_MARK_T_MODULE 1
-#define CONFIG_BRIDGE_EBT_REDIRECT_MODULE 1
-#define CONFIG_BRIDGE_EBT_SNAT_MODULE 1
-#define CONFIG_BRIDGE_EBT_LOG_MODULE 1
-#define CONFIG_XFRM 1
-#define CONFIG_XFRM_USER 1
+#define CONFIG_RAID_ATTRS_MODULE 1
+#define CONFIG_SCSI_MODULE 1
+#define CONFIG_SCSI_PROC_FS 1
 
 /*
- * SCTP Configuration (EXPERIMENTAL)
+ * SCSI support type (disk, tape, CD-ROM)
  */
-#define CONFIG_IP_SCTP_MODULE 1
-#undef CONFIG_SCTP_DBG_MSG
-#undef CONFIG_SCTP_DBG_OBJCNT
-#undef CONFIG_SCTP_HMAC_NONE
-#undef CONFIG_SCTP_HMAC_SHA1
-#define CONFIG_SCTP_HMAC_MD5 1
-#undef CONFIG_ATM
-#define CONFIG_BRIDGE_MODULE 1
-#define CONFIG_VLAN_8021Q_MODULE 1
-#undef CONFIG_DECNET
-#define CONFIG_LLC_MODULE 1
-#undef CONFIG_LLC2
-#define CONFIG_IPX_MODULE 1
-#undef CONFIG_IPX_INTERN
-#define CONFIG_ATALK_MODULE 1
-#define CONFIG_DEV_APPLETALK 1
-#define CONFIG_LTPC_MODULE 1
-#define CONFIG_COPS_MODULE 1
-#define CONFIG_COPS_DAYNA 1
-#define CONFIG_COPS_TANGENT 1
-#define CONFIG_IPDDP_MODULE 1
-#define CONFIG_IPDDP_ENCAP 1
-#define CONFIG_IPDDP_DECAP 1
-#undef CONFIG_X25
-#undef CONFIG_LAPB
-#define CONFIG_NET_DIVERT 1
-#undef CONFIG_ECONET
-#define CONFIG_WAN_ROUTER_MODULE 1
-#undef CONFIG_NET_FASTROUTE
-#undef CONFIG_NET_HW_FLOWCONTROL
+#define CONFIG_BLK_DEV_SD_MODULE 1
+#define CONFIG_CHR_DEV_ST_MODULE 1
+#define CONFIG_CHR_DEV_OSST_MODULE 1
+#define CONFIG_BLK_DEV_SR_MODULE 1
+#define CONFIG_BLK_DEV_SR_VENDOR 1
+#define CONFIG_CHR_DEV_SG_MODULE 1
+#define CONFIG_CHR_DEV_SCH_MODULE 1
 
 /*
- * QoS and/or fair queueing
+ * Some SCSI devices (e.g. CD jukebox) support multiple LUNs
  */
-#define CONFIG_NET_SCHED 1
-#define CONFIG_NET_SCH_CBQ_MODULE 1
-#define CONFIG_NET_SCH_HTB_MODULE 1
-#define CONFIG_NET_SCH_HFSC_MODULE 1
-#define CONFIG_NET_SCH_CSZ_MODULE 1
-#define CONFIG_NET_SCH_PRIO_MODULE 1
-#define CONFIG_NET_SCH_RED_MODULE 1
-#define CONFIG_NET_SCH_SFQ_MODULE 1
-#define CONFIG_NET_SCH_TEQL_MODULE 1
-#define CONFIG_NET_SCH_TBF_MODULE 1
-#define CONFIG_NET_SCH_GRED_MODULE 1
-#define CONFIG_NET_SCH_DSMARK_MODULE 1
-#define CONFIG_NET_SCH_DELAY_MODULE 1
-#define CONFIG_NET_SCH_INGRESS_MODULE 1
-#define CONFIG_NET_QOS 1
-#define CONFIG_NET_ESTIMATOR 1
-#define CONFIG_NET_CLS 1
-#define CONFIG_NET_CLS_TCINDEX_MODULE 1
-#define CONFIG_NET_CLS_ROUTE4_MODULE 1
-#define CONFIG_NET_CLS_ROUTE 1
-#define CONFIG_NET_CLS_FW_MODULE 1
-#define CONFIG_NET_CLS_U32_MODULE 1
-#define CONFIG_NET_CLS_RSVP_MODULE 1
-#define CONFIG_NET_CLS_RSVP6_MODULE 1
-#define CONFIG_NET_CLS_POLICE 1
+#define CONFIG_SCSI_MULTI_LUN 1
+#define CONFIG_SCSI_CONSTANTS 1
+#define CONFIG_SCSI_LOGGING 1
 
 /*
- * Network testing
+ * SCSI Transport Attributes
  */
-#undef CONFIG_NET_PKTGEN
-#define CONFIG_NETPOLL 1
-#undef CONFIG_NETPOLL_RX
-#undef CONFIG_NETPOLL_TRAP
-#define CONFIG_NET_POLL_CONTROLLER 1
-#undef CONFIG_HAMRADIO
-#define CONFIG_IRDA_MODULE 1
+#define CONFIG_SCSI_SPI_ATTRS_MODULE 1
+#define CONFIG_SCSI_FC_ATTRS_MODULE 1
+#define CONFIG_SCSI_ISCSI_ATTRS_MODULE 1
+#define CONFIG_SCSI_SAS_ATTRS_MODULE 1
 
 /*
- * IrDA protocols
+ * SCSI low-level drivers
  */
-#define CONFIG_IRLAN_MODULE 1
-#define CONFIG_IRNET_MODULE 1
-#define CONFIG_IRCOMM_MODULE 1
-#undef CONFIG_IRDA_ULTRA
+#define CONFIG_ISCSI_TCP_MODULE 1
+#define CONFIG_BLK_DEV_3W_XXXX_RAID_MODULE 1
+#define CONFIG_SCSI_3W_9XXX_MODULE 1
+#undef CONFIG_SCSI_7000FASST
+#define CONFIG_SCSI_ACARD_MODULE 1
+#define CONFIG_SCSI_AHA152X_MODULE 1
+#define CONFIG_SCSI_AHA1542_MODULE 1
+#define CONFIG_SCSI_AACRAID_MODULE 1
+#define CONFIG_SCSI_AIC7XXX_MODULE 1
+#define CONFIG_AIC7XXX_CMDS_PER_DEVICE 4
+#define CONFIG_AIC7XXX_RESET_DELAY_MS 15000
+#undef CONFIG_AIC7XXX_DEBUG_ENABLE
+#define CONFIG_AIC7XXX_DEBUG_MASK 0
+#undef CONFIG_AIC7XXX_REG_PRETTY_PRINT
+#define CONFIG_SCSI_AIC7XXX_OLD_MODULE 1
+#define CONFIG_SCSI_AIC79XX_MODULE 1
+#define CONFIG_AIC79XX_CMDS_PER_DEVICE 4
+#define CONFIG_AIC79XX_RESET_DELAY_MS 15000
+#undef CONFIG_AIC79XX_ENABLE_RD_STRM
+#undef CONFIG_AIC79XX_DEBUG_ENABLE
+#define CONFIG_AIC79XX_DEBUG_MASK 0
+#undef CONFIG_AIC79XX_REG_PRETTY_PRINT
+#undef CONFIG_SCSI_DPT_I2O
+#define CONFIG_SCSI_ADVANSYS_MODULE 1
+#undef CONFIG_SCSI_IN2000
+#define CONFIG_MEGARAID_NEWGEN 1
+#define CONFIG_MEGARAID_MM_MODULE 1
+#define CONFIG_MEGARAID_MAILBOX_MODULE 1
+#define CONFIG_MEGARAID_LEGACY_MODULE 1
+#define CONFIG_MEGARAID_SAS_MODULE 1
+#define CONFIG_SCSI_SATA_MODULE 1
+#define CONFIG_SCSI_SATA_AHCI_MODULE 1
+#define CONFIG_SCSI_SATA_SVW_MODULE 1
+#define CONFIG_SCSI_ATA_PIIX_MODULE 1
+#define CONFIG_SCSI_SATA_MV_MODULE 1
+#define CONFIG_SCSI_SATA_NV_MODULE 1
+#define CONFIG_SCSI_PDC_ADMA_MODULE 1
+#define CONFIG_SCSI_SATA_QSTOR_MODULE 1
+#define CONFIG_SCSI_SATA_PROMISE_MODULE 1
+#define CONFIG_SCSI_SATA_SX4_MODULE 1
+#define CONFIG_SCSI_SATA_SIL_MODULE 1
+#define CONFIG_SCSI_SATA_SIL24_MODULE 1
+#define CONFIG_SCSI_SATA_SIS_MODULE 1
+#define CONFIG_SCSI_SATA_ULI_MODULE 1
+#define CONFIG_SCSI_SATA_VIA_MODULE 1
+#define CONFIG_SCSI_SATA_VITESSE_MODULE 1
+#define CONFIG_SCSI_SATA_INTEL_COMBINED 1
+#define CONFIG_SCSI_BUSLOGIC_MODULE 1
+#undef CONFIG_SCSI_OMIT_FLASHPOINT
+#undef CONFIG_SCSI_DMX3191D
+#undef CONFIG_SCSI_DTC3280
+#undef CONFIG_SCSI_EATA
+#define CONFIG_SCSI_FUTURE_DOMAIN_MODULE 1
+#define CONFIG_SCSI_GDTH_MODULE 1
+#undef CONFIG_SCSI_GENERIC_NCR5380
+#undef CONFIG_SCSI_GENERIC_NCR5380_MMIO
+#define CONFIG_SCSI_IPS_MODULE 1
+#define CONFIG_SCSI_INITIO_MODULE 1
+#define CONFIG_SCSI_INIA100_MODULE 1
+#define CONFIG_SCSI_PPA_MODULE 1
+#define CONFIG_SCSI_IMM_MODULE 1
+#undef CONFIG_SCSI_IZIP_EPP16
+#undef CONFIG_SCSI_IZIP_SLOW_CTR
+#undef CONFIG_SCSI_NCR53C406A
+#define CONFIG_SCSI_SYM53C8XX_2_MODULE 1
+#define CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE 1
+#define CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS 16
+#define CONFIG_SCSI_SYM53C8XX_MAX_TAGS 64
+#define CONFIG_SCSI_SYM53C8XX_MMIO 1
+#undef CONFIG_SCSI_IPR
+#undef CONFIG_SCSI_PAS16
+#undef CONFIG_SCSI_PSI240I
+#undef CONFIG_SCSI_QLOGIC_FAS
+#define CONFIG_SCSI_QLOGIC_1280_MODULE 1
+#define CONFIG_SCSI_QLA_FC_MODULE 1
+#define CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE 1
+#define CONFIG_SCSI_QLA21XX_MODULE 1
+#define CONFIG_SCSI_QLA22XX_MODULE 1
+#define CONFIG_SCSI_QLA2300_MODULE 1
+#define CONFIG_SCSI_QLA2322_MODULE 1
+#define CONFIG_SCSI_QLA24XX_MODULE 1
+#define CONFIG_SCSI_LPFC_MODULE 1
+#undef CONFIG_SCSI_SYM53C416
+#define CONFIG_SCSI_DC395x_MODULE 1
+#define CONFIG_SCSI_DC390T_MODULE 1
+#undef CONFIG_SCSI_T128
+#undef CONFIG_SCSI_U14_34F
+#undef CONFIG_SCSI_ULTRASTOR
+#undef CONFIG_SCSI_NSP32
+#undef CONFIG_SCSI_DEBUG
 
 /*
- * IrDA options
+ * PCMCIA SCSI adapter support
  */
-#define CONFIG_IRDA_CACHE_LAST_LSAP 1
-#define CONFIG_IRDA_FAST_RR 1
-#undef CONFIG_IRDA_DEBUG
+#define CONFIG_PCMCIA_AHA152X_MODULE 1
+#define CONFIG_PCMCIA_FDOMAIN_MODULE 1
+#define CONFIG_PCMCIA_NINJA_SCSI_MODULE 1
+#define CONFIG_PCMCIA_QLOGIC_MODULE 1
+#define CONFIG_PCMCIA_SYM53C500_MODULE 1
 
 /*
- * Infrared-port device drivers
+ * Old CD-ROM drivers (not SCSI, not IDE)
  */
+#undef CONFIG_CD_NO_IDESCSI
 
 /*
- * SIR device drivers
+ * Multi-device support (RAID and LVM)
  */
-#define CONFIG_IRTTY_SIR_MODULE 1
+#define CONFIG_MD 1
+#define CONFIG_BLK_DEV_MD 1
+#define CONFIG_MD_LINEAR_MODULE 1
+#define CONFIG_MD_RAID0_MODULE 1
+#define CONFIG_MD_RAID1_MODULE 1
+#define CONFIG_MD_RAID10_MODULE 1
+#define CONFIG_MD_RAID5_MODULE 1
+#define CONFIG_MD_RAID5_RESHAPE 1
+#define CONFIG_MD_RAID6_MODULE 1
+#define CONFIG_MD_MULTIPATH_MODULE 1
+#define CONFIG_MD_FAULTY_MODULE 1
+#define CONFIG_BLK_DEV_DM_MODULE 1
+#define CONFIG_DM_CRYPT_MODULE 1
+#define CONFIG_DM_SNAPSHOT_MODULE 1
+#define CONFIG_DM_MIRROR_MODULE 1
+#define CONFIG_DM_ZERO_MODULE 1
+#define CONFIG_DM_MULTIPATH_MODULE 1
+#define CONFIG_DM_MULTIPATH_EMC_MODULE 1
 
 /*
- * Dongle support
+ * Fusion MPT device support
  */
-#define CONFIG_DONGLE 1
-#define CONFIG_ESI_DONGLE_MODULE 1
-#define CONFIG_ACTISYS_DONGLE_MODULE 1
-#define CONFIG_TEKRAM_DONGLE_MODULE 1
-#define CONFIG_LITELINK_DONGLE_MODULE 1
-#define CONFIG_MA600_DONGLE_MODULE 1
-#define CONFIG_GIRBIL_DONGLE_MODULE 1
-#define CONFIG_MCP2120_DONGLE_MODULE 1
-#define CONFIG_OLD_BELKIN_DONGLE_MODULE 1
-#define CONFIG_ACT200L_DONGLE_MODULE 1
+#define CONFIG_FUSION 1
+#define CONFIG_FUSION_SPI_MODULE 1
+#define CONFIG_FUSION_FC_MODULE 1
+#define CONFIG_FUSION_SAS_MODULE 1
+#define CONFIG_FUSION_MAX_SGE 40
+#define CONFIG_FUSION_CTL_MODULE 1
+#define CONFIG_FUSION_LAN_MODULE 1
 
 /*
- * Old SIR device drivers
+ * IEEE 1394 (FireWire) support
  */
+#define CONFIG_IEEE1394_MODULE 1
 
 /*
- * Old Serial dongle support
+ * Subsystem Options
  */
+#undef CONFIG_IEEE1394_VERBOSEDEBUG
+#define CONFIG_IEEE1394_OUI_DB 1
+#define CONFIG_IEEE1394_EXTRA_CONFIG_ROMS 1
+#define CONFIG_IEEE1394_CONFIG_ROM_IP1394 1
+#undef CONFIG_IEEE1394_EXPORT_FULL_API
 
 /*
- * FIR device drivers
+ * Device Drivers
  */
-#define CONFIG_USB_IRDA_MODULE 1
-#define CONFIG_SIGMATEL_FIR_MODULE 1
-#define CONFIG_NSC_FIR_MODULE 1
-#undef CONFIG_WINBOND_FIR
-#undef CONFIG_TOSHIBA_FIR
-#undef CONFIG_SMC_IRCC_FIR
-#undef CONFIG_ALI_FIR
-#undef CONFIG_VLSI_FIR
-#undef CONFIG_VIA_FIR
-#define CONFIG_BT_MODULE 1
-#define CONFIG_BT_L2CAP_MODULE 1
-#define CONFIG_BT_SCO_MODULE 1
-#define CONFIG_BT_RFCOMM_MODULE 1
-#define CONFIG_BT_RFCOMM_TTY 1
-#define CONFIG_BT_BNEP_MODULE 1
-#define CONFIG_BT_BNEP_MC_FILTER 1
-#define CONFIG_BT_BNEP_PROTO_FILTER 1
-#define CONFIG_BT_CMTP_MODULE 1
+#define CONFIG_IEEE1394_PCILYNX_MODULE 1
+#define CONFIG_IEEE1394_OHCI1394_MODULE 1
 
 /*
- * Bluetooth device drivers
+ * Protocol Drivers
  */
-#define CONFIG_BT_HCIUSB_MODULE 1
-#define CONFIG_BT_HCIUSB_SCO 1
-#define CONFIG_BT_HCIUART_MODULE 1
-#define CONFIG_BT_HCIUART_H4 1
-#define CONFIG_BT_HCIUART_BCSP 1
-#define CONFIG_BT_HCIUART_BCSP_TXCRC 1
-#define CONFIG_BT_HCIBCM203X_MODULE 1
-#define CONFIG_BT_HCIBFUSB_MODULE 1
-#define CONFIG_BT_HCIDTL1_MODULE 1
-#define CONFIG_BT_HCIBT3C_MODULE 1
-#define CONFIG_BT_HCIBLUECARD_MODULE 1
-#define CONFIG_BT_HCIBTUART_MODULE 1
-#define CONFIG_BT_HCIVHCI_MODULE 1
-#define CONFIG_TUX_MODULE 1
+#define CONFIG_IEEE1394_VIDEO1394_MODULE 1
+#define CONFIG_IEEE1394_SBP2_MODULE 1
+#undef CONFIG_IEEE1394_SBP2_PHYS_DMA
+#define CONFIG_IEEE1394_ETH1394_MODULE 1
+#define CONFIG_IEEE1394_DV1394_MODULE 1
+#define CONFIG_IEEE1394_RAWIO_MODULE 1
 
 /*
- * TUX options
+ * I2O device support
+ */
+#define CONFIG_I2O_MODULE 1
+#undef CONFIG_I2O_LCT_NOTIFY_ON_CHANGES
+#define CONFIG_I2O_EXT_ADAPTEC 1
+#define CONFIG_I2O_CONFIG_MODULE 1
+#define CONFIG_I2O_CONFIG_OLD_IOCTL 1
+#define CONFIG_I2O_BUS_MODULE 1
+#define CONFIG_I2O_BLOCK_MODULE 1
+#define CONFIG_I2O_SCSI_MODULE 1
+#define CONFIG_I2O_PROC_MODULE 1
+
+/*
+ * Network device support
  */
-#define CONFIG_TUX_EXTCGI 1
-#undef CONFIG_TUX_EXTENDED_LOG
-#undef CONFIG_TUX_DEBUG
 #define CONFIG_NETDEVICES 1
 #define CONFIG_DUMMY_MODULE 1
 #define CONFIG_BONDING_MODULE 1
 #define CONFIG_EQUALIZER_MODULE 1
 #define CONFIG_TUN_MODULE 1
-#define CONFIG_ETHERTAP_MODULE 1
 #define CONFIG_NET_SB1000_MODULE 1
 
 /*
@@ -1028,6 +1328,20 @@
  */
 #undef CONFIG_ARCNET
 
+/*
+ * PHY device support
+ */
+#define CONFIG_PHYLIB_MODULE 1
+
+/*
+ * MII PHY device drivers
+ */
+#define CONFIG_MARVELL_PHY_MODULE 1
+#define CONFIG_DAVICOM_PHY_MODULE 1
+#define CONFIG_QSEMI_PHY_MODULE 1
+#define CONFIG_LXT_PHY_MODULE 1
+#define CONFIG_CICADA_PHY_MODULE 1
+
 /*
  * Ethernet (10 or 100Mbit)
  */
@@ -1035,23 +1349,22 @@
 #define CONFIG_MII_MODULE 1
 #define CONFIG_HAPPYMEAL_MODULE 1
 #define CONFIG_SUNGEM_MODULE 1
+#define CONFIG_CASSINI_MODULE 1
 #define CONFIG_NET_VENDOR_3COM 1
-#define CONFIG_EL1_MODULE 1
-#define CONFIG_EL2_MODULE 1
-#define CONFIG_ELPLUS_MODULE 1
-#define CONFIG_EL16_MODULE 1
+#undef CONFIG_EL1
+#undef CONFIG_EL2
+#undef CONFIG_ELPLUS
+#undef CONFIG_EL16
 #define CONFIG_EL3_MODULE 1
-#define CONFIG_3C515_MODULE 1
+#undef CONFIG_3C515
 #define CONFIG_VORTEX_MODULE 1
 #define CONFIG_TYPHOON_MODULE 1
-#define CONFIG_LANCE_MODULE 1
+#undef CONFIG_LANCE
 #define CONFIG_NET_VENDOR_SMC 1
-#define CONFIG_WD80x3_MODULE 1
+#undef CONFIG_WD80x3
 #define CONFIG_ULTRA_MODULE 1
-#define CONFIG_SMC9194_MODULE 1
-#define CONFIG_NET_VENDOR_RACAL 1
-#define CONFIG_NI52_MODULE 1
-#define CONFIG_NI65_MODULE 1
+#undef CONFIG_SMC9194
+#undef CONFIG_NET_VENDOR_RACAL
 
 /*
  * Tulip family network device support
@@ -1065,34 +1378,44 @@
 #define CONFIG_DE4X5_MODULE 1
 #define CONFIG_WINBOND_840_MODULE 1
 #define CONFIG_DM9102_MODULE 1
+#define CONFIG_ULI526X_MODULE 1
 #define CONFIG_PCMCIA_XIRCOM_MODULE 1
+#undef CONFIG_PCMCIA_XIRTULIP
 #undef CONFIG_AT1700
-#define CONFIG_DEPCA_MODULE 1
+#undef CONFIG_DEPCA
 #define CONFIG_HP100_MODULE 1
-#undef CONFIG_NET_ISA
+#define CONFIG_NET_ISA 1
+#undef CONFIG_E2100
+#define CONFIG_EWRK3_MODULE 1
+#undef CONFIG_EEXPRESS
+#undef CONFIG_EEXPRESS_PRO
+#undef CONFIG_HPLAN_PLUS
+#undef CONFIG_HPLAN
+#undef CONFIG_LP486E
+#undef CONFIG_ETH16I
 #define CONFIG_NE2000_MODULE 1
+#undef CONFIG_ZNET
+#undef CONFIG_SEEQ8005
 #define CONFIG_NET_PCI 1
 #define CONFIG_PCNET32_MODULE 1
 #define CONFIG_AMD8111_ETH_MODULE 1
 #define CONFIG_AMD8111E_NAPI 1
 #define CONFIG_ADAPTEC_STARFIRE_MODULE 1
 #define CONFIG_ADAPTEC_STARFIRE_NAPI 1
-#define CONFIG_AC3200_MODULE 1
-#define CONFIG_APRICOT_MODULE 1
+#undef CONFIG_AC3200
+#undef CONFIG_APRICOT
 #define CONFIG_B44_MODULE 1
 #define CONFIG_FORCEDETH_MODULE 1
-#define CONFIG_CS89x0_MODULE 1
+#undef CONFIG_CS89x0
 #define CONFIG_DGRS_MODULE 1
-#define CONFIG_EEPRO100_MODULE 1
-#undef CONFIG_EEPRO100_PIO
+#undef CONFIG_EEPRO100
 #define CONFIG_E100_MODULE 1
-#define CONFIG_E100_NAPI 1
 #define CONFIG_FEALNX_MODULE 1
 #define CONFIG_NATSEMI_MODULE 1
 #define CONFIG_NE2K_PCI_MODULE 1
 #define CONFIG_8139CP_MODULE 1
 #define CONFIG_8139TOO_MODULE 1
-#define CONFIG_8139TOO_PIO 1
+#undef CONFIG_8139TOO_PIO
 #undef CONFIG_8139TOO_TUNE_TWISTER
 #define CONFIG_8139TOO_8129 1
 #undef CONFIG_8139_OLD_RX_RESET
@@ -1109,20 +1432,32 @@
 #define CONFIG_DE620_MODULE 1
 
 /*
- * Gigabit Ethernet (1000/10000 Mbit)
+ * Ethernet (1000 Mbit)
  */
-#define CONFIG_NET_GIGE 1
 #define CONFIG_ACENIC_MODULE 1
 #undef CONFIG_ACENIC_OMIT_TIGON_I
 #define CONFIG_DL2K_MODULE 1
 #define CONFIG_E1000_MODULE 1
 #define CONFIG_E1000_NAPI 1
+#undef CONFIG_E1000_DISABLE_PACKET_SPLIT
 #define CONFIG_NS83820_MODULE 1
 #define CONFIG_HAMACHI_MODULE 1
 #define CONFIG_YELLOWFIN_MODULE 1
 #define CONFIG_R8169_MODULE 1
-#define CONFIG_SK98LIN_MODULE 1
+#define CONFIG_R8169_NAPI 1
+#define CONFIG_R8169_VLAN 1
+#define CONFIG_SIS190_MODULE 1
+#define CONFIG_SKGE_MODULE 1
+#define CONFIG_SKY2_MODULE 1
+#undef CONFIG_SK98LIN
+#define CONFIG_VIA_VELOCITY_MODULE 1
 #define CONFIG_TIGON3_MODULE 1
+#define CONFIG_BNX2_MODULE 1
+
+/*
+ * Ethernet (10000 Mbit)
+ */
+#define CONFIG_CHELSIO_T1_MODULE 1
 #define CONFIG_IXGB_MODULE 1
 #define CONFIG_IXGB_NAPI 1
 #define CONFIG_S2IO_MODULE 1
@@ -1131,19 +1466,26 @@
 /*
  * Token Ring devices
  */
-#undef CONFIG_TR
+#define CONFIG_TR 1
+#undef CONFIG_IBMTR
+#define CONFIG_IBMOL_MODULE 1
+#define CONFIG_IBMLS_MODULE 1
+#define CONFIG_3C359_MODULE 1
+#undef CONFIG_TMS380TR
+#undef CONFIG_SMCTR
 
 /*
  * Wireless LAN (non-hamradio)
  */
 #define CONFIG_NET_RADIO 1
+#define CONFIG_NET_WIRELESS_RTNETLINK 1
 
 /*
  * Obsolete Wireless cards support (pre-802.11)
  */
 #undef CONFIG_STRIP
 #undef CONFIG_ARLAN
-#define CONFIG_WAVELAN_MODULE 1
+#undef CONFIG_WAVELAN
 #define CONFIG_PCMCIA_WAVELAN_MODULE 1
 #define CONFIG_PCMCIA_NETWAVE_MODULE 1
 
@@ -1155,10 +1497,18 @@
 /*
  * Wireless 802.11b ISA/PCI cards support
  */
+#define CONFIG_IPW2100_MODULE 1
+#define CONFIG_IPW2100_MONITOR 1
+#undef CONFIG_IPW2100_DEBUG
+#define CONFIG_IPW2200_MODULE 1
+#define CONFIG_IPW2200_MONITOR 1
+#define CONFIG_IPW_QOS 1
+#undef CONFIG_IPW2200_DEBUG
 #define CONFIG_AIRO_MODULE 1
 #define CONFIG_HERMES_MODULE 1
 #define CONFIG_PLX_HERMES_MODULE 1
 #define CONFIG_TMD_HERMES_MODULE 1
+#define CONFIG_NORTEL_HERMES_MODULE 1
 #define CONFIG_PCI_HERMES_MODULE 1
 #define CONFIG_ATMEL_MODULE 1
 #define CONFIG_PCI_ATMEL_MODULE 1
@@ -1167,6 +1517,7 @@
  * Wireless 802.11b Pcmcia/Cardbus cards support
  */
 #define CONFIG_PCMCIA_HERMES_MODULE 1
+#define CONFIG_PCMCIA_SPECTRUM_MODULE 1
 #define CONFIG_AIRO_CS_MODULE 1
 #define CONFIG_PCMCIA_ATMEL_MODULE 1
 #define CONFIG_PCMCIA_WL3501_MODULE 1
@@ -1175,6 +1526,19 @@
  * Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
  */
 #define CONFIG_PRISM54_MODULE 1
+#define CONFIG_HOSTAP_MODULE 1
+#define CONFIG_HOSTAP_FIRMWARE 1
+#define CONFIG_HOSTAP_FIRMWARE_NVRAM 1
+#define CONFIG_HOSTAP_PLX_MODULE 1
+#define CONFIG_HOSTAP_PCI_MODULE 1
+#define CONFIG_HOSTAP_CS_MODULE 1
+#define CONFIG_BCM43XX_MODULE 1
+#define CONFIG_BCM43XX_DEBUG 1
+#define CONFIG_BCM43XX_DMA 1
+#define CONFIG_BCM43XX_PIO 1
+#define CONFIG_BCM43XX_DMA_AND_PIO_MODE 1
+#undef CONFIG_BCM43XX_DMA_MODE
+#undef CONFIG_BCM43XX_PIO_MODE
 #define CONFIG_NET_WIRELESS 1
 
 /*
@@ -1189,11 +1553,40 @@
 #define CONFIG_PCMCIA_SMC91C92_MODULE 1
 #define CONFIG_PCMCIA_XIRC2PS_MODULE 1
 #define CONFIG_PCMCIA_AXNET_MODULE 1
+#define CONFIG_PCMCIA_IBMTR_MODULE 1
 
 /*
  * Wan interfaces
  */
 #undef CONFIG_WAN
+
+/*
+ * ATM drivers
+ */
+#undef CONFIG_ATM_DUMMY
+#define CONFIG_ATM_TCP_MODULE 1
+#define CONFIG_ATM_LANAI_MODULE 1
+#define CONFIG_ATM_ENI_MODULE 1
+#undef CONFIG_ATM_ENI_DEBUG
+#undef CONFIG_ATM_ENI_TUNE_BURST
+#define CONFIG_ATM_FIRESTREAM_MODULE 1
+#undef CONFIG_ATM_ZATM
+#define CONFIG_ATM_NICSTAR_MODULE 1
+#undef CONFIG_ATM_NICSTAR_USE_SUNI
+#undef CONFIG_ATM_NICSTAR_USE_IDT77105
+#define CONFIG_ATM_IDT77252_MODULE 1
+#undef CONFIG_ATM_IDT77252_DEBUG
+#undef CONFIG_ATM_IDT77252_RCV_ALL
+#define CONFIG_ATM_IDT77252_USE_SUNI 1
+#define CONFIG_ATM_AMBASSADOR_MODULE 1
+#undef CONFIG_ATM_AMBASSADOR_DEBUG
+#define CONFIG_ATM_HORIZON_MODULE 1
+#undef CONFIG_ATM_HORIZON_DEBUG
+#undef CONFIG_ATM_IA
+#define CONFIG_ATM_FORE200E_MAYBE_MODULE 1
+#undef CONFIG_ATM_FORE200E_PCA
+#define CONFIG_ATM_HE_MODULE 1
+#undef CONFIG_ATM_HE_USE_SUNI
 #define CONFIG_FDDI 1
 #undef CONFIG_DEFXX
 #define CONFIG_SKFP_MODULE 1
@@ -1206,11 +1599,20 @@
 #define CONFIG_PPP_SYNC_TTY_MODULE 1
 #define CONFIG_PPP_DEFLATE_MODULE 1
 #undef CONFIG_PPP_BSDCOMP
+#define CONFIG_PPP_MPPE_MODULE 1
 #define CONFIG_PPPOE_MODULE 1
-#undef CONFIG_SLIP
+#define CONFIG_PPPOATM_MODULE 1
+#define CONFIG_SLIP_MODULE 1
+#define CONFIG_SLIP_COMPRESSED 1
+#define CONFIG_SLIP_SMART 1
+#undef CONFIG_SLIP_MODE_SLIP6
 #define CONFIG_NET_FC 1
 #undef CONFIG_SHAPER
 #define CONFIG_NETCONSOLE_MODULE 1
+#define CONFIG_NETPOLL 1
+#undef CONFIG_NETPOLL_RX
+#define CONFIG_NETPOLL_TRAP 1
+#define CONFIG_NET_POLL_CONTROLLER 1
 
 /*
  * ISDN subsystem
@@ -1232,6 +1634,8 @@
 /*
  * ISDN feature submodules
  */
+#define CONFIG_ISDN_DRV_LOOP_MODULE 1
+#define CONFIG_ISDN_DIVERSION_MODULE 1
 
 /*
  * ISDN4Linux hardware drivers
@@ -1257,27 +1661,27 @@
 /*
  * HiSax supported cards
  */
-#define CONFIG_HISAX_16_0 1
+#undef CONFIG_HISAX_16_0
 #define CONFIG_HISAX_16_3 1
 #define CONFIG_HISAX_TELESPCI 1
 #define CONFIG_HISAX_S0BOX 1
-#define CONFIG_HISAX_AVM_A1 1
+#undef CONFIG_HISAX_AVM_A1
 #define CONFIG_HISAX_FRITZPCI 1
 #define CONFIG_HISAX_AVM_A1_PCMCIA 1
 #define CONFIG_HISAX_ELSA 1
-#define CONFIG_HISAX_IX1MICROR2 1
+#undef CONFIG_HISAX_IX1MICROR2
 #define CONFIG_HISAX_DIEHLDIVA 1
-#define CONFIG_HISAX_ASUSCOM 1
-#define CONFIG_HISAX_TELEINT 1
-#define CONFIG_HISAX_HFCS 1
+#undef CONFIG_HISAX_ASUSCOM
+#undef CONFIG_HISAX_TELEINT
+#undef CONFIG_HISAX_HFCS
 #define CONFIG_HISAX_SEDLBAUER 1
-#define CONFIG_HISAX_SPORTSTER 1
-#define CONFIG_HISAX_MIC 1
+#undef CONFIG_HISAX_SPORTSTER
+#undef CONFIG_HISAX_MIC
 #define CONFIG_HISAX_NETJET 1
 #define CONFIG_HISAX_NETJET_U 1
 #define CONFIG_HISAX_NICCY 1
-#define CONFIG_HISAX_ISURF 1
-#define CONFIG_HISAX_HSTSAPHIR 1
+#undef CONFIG_HISAX_ISURF
+#undef CONFIG_HISAX_HSTSAPHIR
 #define CONFIG_HISAX_BKM_A4T 1
 #define CONFIG_HISAX_SCT_QUADRO 1
 #define CONFIG_HISAX_GAZEL 1
@@ -1299,18 +1703,29 @@
  * HiSax sub driver modules
  */
 #define CONFIG_HISAX_ST5481_MODULE 1
-#define CONFIG_HISAX_HFCUSB_MODULE 1
+#undef CONFIG_HISAX_HFCUSB
+#define CONFIG_HISAX_HFC4S8S_MODULE 1
 #define CONFIG_HISAX_FRITZ_PCIPNP_MODULE 1
 #define CONFIG_HISAX_HDLC 1
 
 /*
  * Active cards
  */
-#define CONFIG_ISDN_DRV_ICN_MODULE 1
-#define CONFIG_ISDN_DRV_PCBIT_MODULE 1
-#define CONFIG_ISDN_DRV_SC_MODULE 1
-#define CONFIG_ISDN_DRV_ACT2000_MODULE 1
-#define CONFIG_ISDN_DRV_TPAM_MODULE 1
+#undef CONFIG_ISDN_DRV_ICN
+#undef CONFIG_ISDN_DRV_PCBIT
+#undef CONFIG_ISDN_DRV_SC
+#undef CONFIG_ISDN_DRV_ACT2000
+#define CONFIG_HYSDN_MODULE 1
+#define CONFIG_HYSDN_CAPI 1
+
+/*
+ * Siemens Gigaset
+ */
+#define CONFIG_ISDN_DRV_GIGASET_MODULE 1
+#define CONFIG_GIGASET_BASE_MODULE 1
+#define CONFIG_GIGASET_M105_MODULE 1
+#undef CONFIG_GIGASET_DEBUG
+#undef CONFIG_GIGASET_UNDOCREQ
 
 /*
  * CAPI subsystem
@@ -1331,6 +1746,14 @@
  * Active AVM cards
  */
 #define CONFIG_CAPI_AVM 1
+#undef CONFIG_ISDN_DRV_AVMB1_B1ISA
+#define CONFIG_ISDN_DRV_AVMB1_B1PCI_MODULE 1
+#define CONFIG_ISDN_DRV_AVMB1_B1PCIV4 1
+#undef CONFIG_ISDN_DRV_AVMB1_T1ISA
+#define CONFIG_ISDN_DRV_AVMB1_B1PCMCIA_MODULE 1
+#define CONFIG_ISDN_DRV_AVMB1_AVM_CS_MODULE 1
+#define CONFIG_ISDN_DRV_AVMB1_T1PCI_MODULE 1
+#define CONFIG_ISDN_DRV_AVMB1_C4_MODULE 1
 
 /*
  * Active Eicon DIVA Server cards
@@ -1365,24 +1788,6 @@
 #define CONFIG_INPUT_EVDEV 1
 #undef CONFIG_INPUT_EVBUG
 
-/*
- * Input I/O drivers
- */
-#define CONFIG_GAMEPORT_MODULE 1
-#define CONFIG_SOUND_GAMEPORT_MODULE 1
-#define CONFIG_GAMEPORT_NS558_MODULE 1
-#define CONFIG_GAMEPORT_L4_MODULE 1
-#define CONFIG_GAMEPORT_EMU10K1_MODULE 1
-#define CONFIG_GAMEPORT_VORTEX_MODULE 1
-#define CONFIG_GAMEPORT_FM801_MODULE 1
-#define CONFIG_GAMEPORT_CS461x_MODULE 1
-#define CONFIG_SERIO 1
-#define CONFIG_SERIO_I8042 1
-#define CONFIG_SERIO_SERPORT 1
-#undef CONFIG_SERIO_CT82C710
-#undef CONFIG_SERIO_PARKBD
-#undef CONFIG_SERIO_PCIPS2
-
 /*
  * Input Device Drivers
  */
@@ -1395,10 +1800,9 @@
 #define CONFIG_INPUT_MOUSE 1
 #define CONFIG_MOUSE_PS2 1
 #define CONFIG_MOUSE_SERIAL_MODULE 1
-#define CONFIG_MOUSE_INPORT_MODULE 1
-#define CONFIG_MOUSE_ATIXL 1
-#define CONFIG_MOUSE_LOGIBM_MODULE 1
-#define CONFIG_MOUSE_PC110PAD_MODULE 1
+#undef CONFIG_MOUSE_INPORT
+#undef CONFIG_MOUSE_LOGIBM
+#undef CONFIG_MOUSE_PC110PAD
 #define CONFIG_MOUSE_VSXXXAA_MODULE 1
 #define CONFIG_INPUT_JOYSTICK 1
 #define CONFIG_JOYSTICK_ANALOG_MODULE 1
@@ -1420,16 +1824,37 @@
 #define CONFIG_JOYSTICK_SPACEORB_MODULE 1
 #define CONFIG_JOYSTICK_SPACEBALL_MODULE 1
 #define CONFIG_JOYSTICK_STINGER_MODULE 1
-#define CONFIG_JOYSTICK_TWIDDLER_MODULE 1
+#define CONFIG_JOYSTICK_TWIDJOY_MODULE 1
 #define CONFIG_JOYSTICK_DB9_MODULE 1
 #define CONFIG_JOYSTICK_GAMECON_MODULE 1
 #define CONFIG_JOYSTICK_TURBOGRAFX_MODULE 1
-#undef CONFIG_INPUT_JOYDUMP
+#define CONFIG_JOYSTICK_JOYDUMP_MODULE 1
 #define CONFIG_INPUT_TOUCHSCREEN 1
 #define CONFIG_TOUCHSCREEN_GUNZE_MODULE 1
+#define CONFIG_TOUCHSCREEN_ELO_MODULE 1
+#define CONFIG_TOUCHSCREEN_MTOUCH_MODULE 1
+#define CONFIG_TOUCHSCREEN_MK712_MODULE 1
 #define CONFIG_INPUT_MISC 1
 #define CONFIG_INPUT_PCSPKR_MODULE 1
-#undef CONFIG_INPUT_UINPUT
+#define CONFIG_INPUT_WISTRON_BTNS_MODULE 1
+#define CONFIG_INPUT_UINPUT_MODULE 1
+
+/*
+ * Hardware I/O ports
+ */
+#define CONFIG_SERIO 1
+#define CONFIG_SERIO_I8042 1
+#define CONFIG_SERIO_SERPORT 1
+#undef CONFIG_SERIO_CT82C710
+#undef CONFIG_SERIO_PARKBD
+#undef CONFIG_SERIO_PCIPS2
+#define CONFIG_SERIO_LIBPS2 1
+#define CONFIG_SERIO_RAW_MODULE 1
+#define CONFIG_GAMEPORT_MODULE 1
+#define CONFIG_GAMEPORT_NS558_MODULE 1
+#define CONFIG_GAMEPORT_L4_MODULE 1
+#define CONFIG_GAMEPORT_EMU10K1_MODULE 1
+#define CONFIG_GAMEPORT_FM801_MODULE 1
 
 /*
  * Character devices
@@ -1438,33 +1863,50 @@
 #define CONFIG_VT_CONSOLE 1
 #define CONFIG_HW_CONSOLE 1
 #define CONFIG_SERIAL_NONSTANDARD 1
+#undef CONFIG_COMPUTONE
 #define CONFIG_ROCKETPORT_MODULE 1
 #undef CONFIG_CYCLADES
+#undef CONFIG_DIGIEPCA
+#undef CONFIG_ESPSERIAL
+#undef CONFIG_MOXA_INTELLIO
+#undef CONFIG_MOXA_SMARTIO
+#undef CONFIG_ISI
 #define CONFIG_SYNCLINK_MODULE 1
 #define CONFIG_SYNCLINKMP_MODULE 1
+#undef CONFIG_SYNCLINK_GT
 #define CONFIG_N_HDLC_MODULE 1
-#define CONFIG_STALDRV 1
+#undef CONFIG_RISCOM8
+#undef CONFIG_SPECIALIX
+#undef CONFIG_SX
+#undef CONFIG_RIO
+#undef CONFIG_STALDRV
 
 /*
  * Serial drivers
  */
 #define CONFIG_SERIAL_8250 1
 #define CONFIG_SERIAL_8250_CONSOLE 1
+#define CONFIG_SERIAL_8250_PCI 1
+#define CONFIG_SERIAL_8250_PNP 1
 #define CONFIG_SERIAL_8250_CS_MODULE 1
-#undef CONFIG_SERIAL_8250_ACPI
-#define CONFIG_SERIAL_8250_NR_UARTS 4
+#define CONFIG_SERIAL_8250_NR_UARTS 32
+#define CONFIG_SERIAL_8250_RUNTIME_UARTS 4
 #define CONFIG_SERIAL_8250_EXTENDED 1
-#undef CONFIG_SERIAL_8250_MANY_PORTS
+#define CONFIG_SERIAL_8250_MANY_PORTS 1
 #define CONFIG_SERIAL_8250_SHARE_IRQ 1
 #define CONFIG_SERIAL_8250_DETECT_IRQ 1
-#define CONFIG_SERIAL_8250_MULTIPORT 1
 #define CONFIG_SERIAL_8250_RSA 1
+#undef CONFIG_SERIAL_8250_FOURPORT
+#undef CONFIG_SERIAL_8250_ACCENT
+#undef CONFIG_SERIAL_8250_BOCA
+#undef CONFIG_SERIAL_8250_HUB6
 
 /*
  * Non-8250 serial port support
  */
 #define CONFIG_SERIAL_CORE 1
 #define CONFIG_SERIAL_CORE_CONSOLE 1
+#undef CONFIG_SERIAL_JSM
 #define CONFIG_UNIX98_PTYS 1
 #undef CONFIG_LEGACY_PTYS
 #define CONFIG_CRASH_MODULE 1
@@ -1472,7 +1914,6 @@
 #define CONFIG_LP_CONSOLE 1
 #define CONFIG_PPDEV_MODULE 1
 #define CONFIG_TIPAR_MODULE 1
-#undef CONFIG_QIC02_TAPE
 
 /*
  * IPMI
@@ -1482,6 +1923,7 @@
 #define CONFIG_IPMI_DEVICE_INTERFACE_MODULE 1
 #define CONFIG_IPMI_SI_MODULE 1
 #define CONFIG_IPMI_WATCHDOG_MODULE 1
+#define CONFIG_IPMI_POWEROFF_MODULE 1
 
 /*
  * Watchdog Cards
@@ -1493,30 +1935,33 @@
  * Watchdog Device Drivers
  */
 #define CONFIG_SOFT_WATCHDOG_MODULE 1
-#define CONFIG_ACQUIRE_WDT_MODULE 1
-#define CONFIG_ADVANTECH_WDT_MODULE 1
+#undef CONFIG_ACQUIRE_WDT
+#undef CONFIG_ADVANTECH_WDT
 #define CONFIG_ALIM1535_WDT_MODULE 1
 #define CONFIG_ALIM7101_WDT_MODULE 1
-#define CONFIG_SC520_WDT_MODULE 1
-#define CONFIG_EUROTECH_WDT_MODULE 1
-#define CONFIG_IB700_WDT_MODULE 1
-#define CONFIG_WAFER_WDT_MODULE 1
+#undef CONFIG_SC520_WDT
+#undef CONFIG_EUROTECH_WDT
+#undef CONFIG_IB700_WDT
+#define CONFIG_IBMASR_MODULE 1
+#undef CONFIG_WAFER_WDT
+#define CONFIG_I6300ESB_WDT_MODULE 1
 #define CONFIG_I8XX_TCO_MODULE 1
-#define CONFIG_SC1200_WDT_MODULE 1
-#undef CONFIG_SCx200_WDT
+#undef CONFIG_SC1200_WDT
 #undef CONFIG_60XX_WDT
-#define CONFIG_CPU5_WDT_MODULE 1
+#undef CONFIG_SBC8360_WDT
+#undef CONFIG_CPU5_WDT
 #define CONFIG_W83627HF_WDT_MODULE 1
 #define CONFIG_W83877F_WDT_MODULE 1
+#define CONFIG_W83977F_WDT_MODULE 1
 #define CONFIG_MACHZ_WDT_MODULE 1
+#undef CONFIG_SBC_EPX_C3_WATCHDOG
 
 /*
  * ISA-based Watchdog Cards
  */
-#define CONFIG_PCWATCHDOG_MODULE 1
+#undef CONFIG_PCWATCHDOG
 #undef CONFIG_MIXCOMWD
-#define CONFIG_WDT_MODULE 1
-#undef CONFIG_WDT_501
+#undef CONFIG_WDT
 
 /*
  * PCI-based Watchdog Cards
@@ -1530,7 +1975,7 @@
  */
 #define CONFIG_USBPCWATCHDOG_MODULE 1
 #define CONFIG_HW_RANDOM_MODULE 1
-#define CONFIG_NVRAM_MODULE 1
+#define CONFIG_NVRAM 1
 #define CONFIG_RTC 1
 #define CONFIG_DTLK_MODULE 1
 #define CONFIG_R3964_MODULE 1
@@ -1540,36 +1985,50 @@
 /*
  * Ftape, the floppy tape device driver
  */
+#undef CONFIG_FTAPE
 #define CONFIG_AGP 1
 #define CONFIG_AGP_ALI 1
 #define CONFIG_AGP_ATI 1
 #define CONFIG_AGP_AMD 1
 #define CONFIG_AGP_AMD64 1
 #define CONFIG_AGP_INTEL 1
-#define CONFIG_AGP_INTEL_MCH 1
 #define CONFIG_AGP_NVIDIA 1
 #define CONFIG_AGP_SIS 1
 #define CONFIG_AGP_SWORKS 1
 #define CONFIG_AGP_VIA 1
 #define CONFIG_AGP_EFFICEON 1
-#define CONFIG_DRM 1
+#define CONFIG_DRM_MODULE 1
 #define CONFIG_DRM_TDFX_MODULE 1
-#define CONFIG_DRM_GAMMA_MODULE 1
 #define CONFIG_DRM_R128_MODULE 1
 #define CONFIG_DRM_RADEON_MODULE 1
 #define CONFIG_DRM_I810_MODULE 1
 #define CONFIG_DRM_I830_MODULE 1
+#define CONFIG_DRM_I915_MODULE 1
 #define CONFIG_DRM_MGA_MODULE 1
 #define CONFIG_DRM_SIS_MODULE 1
+#define CONFIG_DRM_VIA_MODULE 1
+#define CONFIG_DRM_SAVAGE_MODULE 1
 
 /*
  * PCMCIA character devices
  */
 #define CONFIG_SYNCLINK_CS_MODULE 1
+#define CONFIG_CARDMAN_4000_MODULE 1
+#define CONFIG_CARDMAN_4040_MODULE 1
 #define CONFIG_MWAVE_MODULE 1
+#define CONFIG_CS5535_GPIO_MODULE 1
 #undef CONFIG_RAW_DRIVER
+#define CONFIG_HPET 1
+#undef CONFIG_HPET_RTC_IRQ
+#undef CONFIG_HPET_MMAP
 #define CONFIG_HANGCHECK_TIMER_MODULE 1
 
+/*
+ * TPM devices
+ */
+#undef CONFIG_TCG_TPM
+#undef CONFIG_TELCLOCK
+
 /*
  * I2C support
  */
@@ -1581,6 +2040,7 @@
  */
 #define CONFIG_I2C_ALGOBIT_MODULE 1
 #define CONFIG_I2C_ALGOPCF_MODULE 1
+#define CONFIG_I2C_ALGOPCA_MODULE 1
 
 /*
  * I2C Hardware Bus support
@@ -1589,57 +2049,112 @@
 #define CONFIG_I2C_ALI1563_MODULE 1
 #define CONFIG_I2C_ALI15X3_MODULE 1
 #define CONFIG_I2C_AMD756_MODULE 1
+#define CONFIG_I2C_AMD756_S4882_MODULE 1
 #define CONFIG_I2C_AMD8111_MODULE 1
+#undef CONFIG_I2C_ELEKTOR
 #define CONFIG_I2C_I801_MODULE 1
 #define CONFIG_I2C_I810_MODULE 1
+#define CONFIG_I2C_PIIX4_MODULE 1
 #define CONFIG_I2C_ISA_MODULE 1
 #define CONFIG_I2C_NFORCE2_MODULE 1
-#undef CONFIG_I2C_PARPORT
-#undef CONFIG_I2C_PARPORT_LIGHT
-#define CONFIG_I2C_PIIX4_MODULE 1
+#define CONFIG_I2C_PARPORT_MODULE 1
+#define CONFIG_I2C_PARPORT_LIGHT_MODULE 1
 #define CONFIG_I2C_PROSAVAGE_MODULE 1
 #define CONFIG_I2C_SAVAGE4_MODULE 1
 #undef CONFIG_SCx200_ACB
 #define CONFIG_I2C_SIS5595_MODULE 1
 #define CONFIG_I2C_SIS630_MODULE 1
 #define CONFIG_I2C_SIS96X_MODULE 1
+#define CONFIG_I2C_STUB_MODULE 1
 #define CONFIG_I2C_VIA_MODULE 1
 #define CONFIG_I2C_VIAPRO_MODULE 1
 #define CONFIG_I2C_VOODOO3_MODULE 1
+#define CONFIG_I2C_PCA_ISA_MODULE 1
+
+/*
+ * Miscellaneous I2C Chip support
+ */
+#define CONFIG_SENSORS_DS1337_MODULE 1
+#define CONFIG_SENSORS_DS1374_MODULE 1
+#define CONFIG_SENSORS_EEPROM_MODULE 1
+#define CONFIG_SENSORS_PCF8574_MODULE 1
+#define CONFIG_SENSORS_PCA9539_MODULE 1
+#define CONFIG_SENSORS_PCF8591_MODULE 1
+#define CONFIG_SENSORS_MAX6875_MODULE 1
+#undef CONFIG_I2C_DEBUG_CORE
+#undef CONFIG_I2C_DEBUG_ALGO
+#undef CONFIG_I2C_DEBUG_BUS
+#undef CONFIG_I2C_DEBUG_CHIP
+
+/*
+ * SPI support
+ */
+#undef CONFIG_SPI
+#undef CONFIG_SPI_MASTER
+
+/*
+ * Dallas's 1-wire bus
+ */
+#define CONFIG_W1_MODULE 1
+
+/*
+ * 1-wire Bus Masters
+ */
+#define CONFIG_W1_MASTER_MATROX_MODULE 1
+#define CONFIG_W1_MASTER_DS9490_MODULE 1
+#define CONFIG_W1_MASTER_DS9490_BRIDGE_MODULE 1
+#define CONFIG_W1_MASTER_DS2482_MODULE 1
+
+/*
+ * 1-wire Slaves
+ */
+#define CONFIG_W1_SLAVE_THERM_MODULE 1
+#define CONFIG_W1_SLAVE_SMEM_MODULE 1
+#define CONFIG_W1_SLAVE_DS2433_MODULE 1
 
 /*
- * Hardware Sensors Chip support
+ * Hardware Monitoring support
  */
-#define CONFIG_I2C_SENSOR_MODULE 1
+#define CONFIG_HWMON_MODULE 1
+#define CONFIG_HWMON_VID_MODULE 1
 #define CONFIG_SENSORS_ADM1021_MODULE 1
+#define CONFIG_SENSORS_ADM1025_MODULE 1
+#define CONFIG_SENSORS_ADM1026_MODULE 1
+#define CONFIG_SENSORS_ADM1031_MODULE 1
+#define CONFIG_SENSORS_ADM9240_MODULE 1
 #define CONFIG_SENSORS_ASB100_MODULE 1
+#define CONFIG_SENSORS_ATXP1_MODULE 1
 #define CONFIG_SENSORS_DS1621_MODULE 1
+#define CONFIG_SENSORS_F71805F_MODULE 1
 #define CONFIG_SENSORS_FSCHER_MODULE 1
+#define CONFIG_SENSORS_FSCPOS_MODULE 1
 #define CONFIG_SENSORS_GL518SM_MODULE 1
+#define CONFIG_SENSORS_GL520SM_MODULE 1
 #define CONFIG_SENSORS_IT87_MODULE 1
+#define CONFIG_SENSORS_LM63_MODULE 1
 #define CONFIG_SENSORS_LM75_MODULE 1
+#define CONFIG_SENSORS_LM77_MODULE 1
 #define CONFIG_SENSORS_LM78_MODULE 1
 #define CONFIG_SENSORS_LM80_MODULE 1
 #define CONFIG_SENSORS_LM83_MODULE 1
 #define CONFIG_SENSORS_LM85_MODULE 1
+#define CONFIG_SENSORS_LM87_MODULE 1
 #define CONFIG_SENSORS_LM90_MODULE 1
+#define CONFIG_SENSORS_LM92_MODULE 1
 #define CONFIG_SENSORS_MAX1619_MODULE 1
+#define CONFIG_SENSORS_PC87360_MODULE 1
+#define CONFIG_SENSORS_SIS5595_MODULE 1
+#define CONFIG_SENSORS_SMSC47M1_MODULE 1
+#define CONFIG_SENSORS_SMSC47B397_MODULE 1
 #define CONFIG_SENSORS_VIA686A_MODULE 1
+#define CONFIG_SENSORS_VT8231_MODULE 1
 #define CONFIG_SENSORS_W83781D_MODULE 1
+#define CONFIG_SENSORS_W83792D_MODULE 1
 #define CONFIG_SENSORS_W83L785TS_MODULE 1
 #define CONFIG_SENSORS_W83627HF_MODULE 1
-
-/*
- * Other I2C Chip support
- */
-#define CONFIG_SENSORS_EEPROM_MODULE 1
-#define CONFIG_SENSORS_PCF8574_MODULE 1
-#define CONFIG_SENSORS_PCF8591_MODULE 1
-#define CONFIG_SENSORS_RTC8564_MODULE 1
-#undef CONFIG_I2C_DEBUG_CORE
-#undef CONFIG_I2C_DEBUG_ALGO
-#undef CONFIG_I2C_DEBUG_BUS
-#undef CONFIG_I2C_DEBUG_CHIP
+#define CONFIG_SENSORS_W83627EHF_MODULE 1
+#define CONFIG_SENSORS_HDAPS_MODULE 1
+#undef CONFIG_HWMON_DEBUG_CHIP
 
 /*
  * Misc devices
@@ -1650,22 +2165,30 @@
  * Multimedia devices
  */
 #define CONFIG_VIDEO_DEV_MODULE 1
+#define CONFIG_VIDEO_V4L1 1
+#define CONFIG_VIDEO_V4L1_COMPAT 1
+#define CONFIG_VIDEO_V4L2_MODULE 1
 
 /*
- * Video For Linux
+ * Video Capture Adapters
  */
 
 /*
- * Video Adapters
+ * Video Capture Adapters
  */
+#undef CONFIG_VIDEO_ADV_DEBUG
+#undef CONFIG_VIDEO_VIVI
 #define CONFIG_VIDEO_BT848_MODULE 1
-#define CONFIG_VIDEO_PMS_MODULE 1
+#define CONFIG_VIDEO_BT848_DVB 1
+#define CONFIG_VIDEO_SAA6588_MODULE 1
+#undef CONFIG_VIDEO_PMS
 #define CONFIG_VIDEO_BWQCAM_MODULE 1
 #define CONFIG_VIDEO_CQCAM_MODULE 1
 #define CONFIG_VIDEO_W9966_MODULE 1
 #define CONFIG_VIDEO_CPIA_MODULE 1
 #define CONFIG_VIDEO_CPIA_PP_MODULE 1
 #define CONFIG_VIDEO_CPIA_USB_MODULE 1
+#define CONFIG_VIDEO_CPIA2_MODULE 1
 #define CONFIG_VIDEO_SAA5246A_MODULE 1
 #define CONFIG_VIDEO_SAA5249_MODULE 1
 #define CONFIG_TUNER_3036_MODULE 1
@@ -1676,95 +2199,262 @@
 #define CONFIG_VIDEO_ZORAN_DC30_MODULE 1
 #define CONFIG_VIDEO_ZORAN_LML33_MODULE 1
 #define CONFIG_VIDEO_ZORAN_LML33R10_MODULE 1
+#define CONFIG_VIDEO_MEYE_MODULE 1
 #define CONFIG_VIDEO_SAA7134_MODULE 1
+#define CONFIG_VIDEO_SAA7134_ALSA_MODULE 1
+#define CONFIG_VIDEO_SAA7134_DVB_MODULE 1
+#define CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS 1
 #define CONFIG_VIDEO_MXB_MODULE 1
 #define CONFIG_VIDEO_DPC_MODULE 1
 #define CONFIG_VIDEO_HEXIUM_ORION_MODULE 1
 #define CONFIG_VIDEO_HEXIUM_GEMINI_MODULE 1
+#define CONFIG_VIDEO_CX88_VP3054_MODULE 1
 #define CONFIG_VIDEO_CX88_MODULE 1
+#define CONFIG_VIDEO_CX88_ALSA_MODULE 1
+#define CONFIG_VIDEO_CX88_DVB_MODULE 1
+#define CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS 1
+#define CONFIG_VIDEO_OVCAMCHIP_MODULE 1
+
+/*
+ * Encoders and Decoders
+ */
+#define CONFIG_VIDEO_MSP3400_MODULE 1
+#define CONFIG_VIDEO_CS53L32A_MODULE 1
+#define CONFIG_VIDEO_WM8775_MODULE 1
+#define CONFIG_VIDEO_WM8739_MODULE 1
+#define CONFIG_VIDEO_CX25840_MODULE 1
+#define CONFIG_VIDEO_SAA711X_MODULE 1
+#define CONFIG_VIDEO_SAA7127_MODULE 1
+#define CONFIG_VIDEO_UPD64031A_MODULE 1
+#define CONFIG_VIDEO_UPD64083_MODULE 1
+
+/*
+ * V4L USB devices
+ */
+#define CONFIG_VIDEO_EM28XX_MODULE 1
+#define CONFIG_USB_DSBR_MODULE 1
+#define CONFIG_VIDEO_USBVIDEO_MODULE 1
+#define CONFIG_USB_VICAM_MODULE 1
+#define CONFIG_USB_IBMCAM_MODULE 1
+#define CONFIG_USB_KONICAWC_MODULE 1
+#define CONFIG_USB_ET61X251_MODULE 1
+#define CONFIG_USB_OV511_MODULE 1
+#define CONFIG_USB_SE401_MODULE 1
+#define CONFIG_USB_SN9C102_MODULE 1
+#define CONFIG_USB_STV680_MODULE 1
+#define CONFIG_USB_W9968CF_MODULE 1
+#define CONFIG_USB_ZC0301_MODULE 1
+#define CONFIG_USB_PWC_MODULE 1
 
 /*
  * Radio Adapters
  */
-#define CONFIG_RADIO_CADET_MODULE 1
-#define CONFIG_RADIO_RTRACK_MODULE 1
-#define CONFIG_RADIO_RTRACK2_MODULE 1
-#define CONFIG_RADIO_AZTECH_MODULE 1
-#define CONFIG_RADIO_GEMTEK_MODULE 1
+#undef CONFIG_RADIO_CADET
+#undef CONFIG_RADIO_RTRACK
+#undef CONFIG_RADIO_RTRACK2
+#undef CONFIG_RADIO_AZTECH
+#undef CONFIG_RADIO_GEMTEK
 #define CONFIG_RADIO_GEMTEK_PCI_MODULE 1
 #define CONFIG_RADIO_MAXIRADIO_MODULE 1
 #define CONFIG_RADIO_MAESTRO_MODULE 1
-#define CONFIG_RADIO_SF16FMI_MODULE 1
-#define CONFIG_RADIO_SF16FMR2_MODULE 1
-#define CONFIG_RADIO_TERRATEC_MODULE 1
-#define CONFIG_RADIO_TRUST_MODULE 1
-#define CONFIG_RADIO_TYPHOON_MODULE 1
-#define CONFIG_RADIO_TYPHOON_PROC_FS 1
-#define CONFIG_RADIO_ZOLTRIX_MODULE 1
+#undef CONFIG_RADIO_SF16FMI
+#undef CONFIG_RADIO_SF16FMR2
+#undef CONFIG_RADIO_TERRATEC
+#undef CONFIG_RADIO_TRUST
+#undef CONFIG_RADIO_TYPHOON
+#undef CONFIG_RADIO_ZOLTRIX
 
 /*
  * Digital Video Broadcasting Devices
  */
-#undef CONFIG_DVB
+#define CONFIG_DVB 1
+#define CONFIG_DVB_CORE_MODULE 1
+
+/*
+ * Supported SAA7146 based PCI Adapters
+ */
+#define CONFIG_DVB_AV7110_MODULE 1
+#define CONFIG_DVB_AV7110_OSD 1
+#define CONFIG_DVB_BUDGET_MODULE 1
+#define CONFIG_DVB_BUDGET_CI_MODULE 1
+#define CONFIG_DVB_BUDGET_AV_MODULE 1
+#define CONFIG_DVB_BUDGET_PATCH_MODULE 1
+
+/*
+ * Supported USB Adapters
+ */
+#define CONFIG_DVB_USB_MODULE 1
+#undef CONFIG_DVB_USB_DEBUG
+#define CONFIG_DVB_USB_A800_MODULE 1
+#define CONFIG_DVB_USB_DIBUSB_MB_MODULE 1
+#undef CONFIG_DVB_USB_DIBUSB_MB_FAULTY
+#define CONFIG_DVB_USB_DIBUSB_MC_MODULE 1
+#define CONFIG_DVB_USB_UMT_010_MODULE 1
+#define CONFIG_DVB_USB_CXUSB_MODULE 1
+#define CONFIG_DVB_USB_DIGITV_MODULE 1
+#define CONFIG_DVB_USB_VP7045_MODULE 1
+#define CONFIG_DVB_USB_VP702X_MODULE 1
+#define CONFIG_DVB_USB_NOVA_T_USB2_MODULE 1
+#define CONFIG_DVB_USB_DTT200U_MODULE 1
+#define CONFIG_DVB_TTUSB_BUDGET_MODULE 1
+#define CONFIG_DVB_TTUSB_DEC_MODULE 1
+#define CONFIG_DVB_CINERGYT2_MODULE 1
+#define CONFIG_DVB_CINERGYT2_TUNING 1
+#define CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT 32
+#define CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE 512
+#define CONFIG_DVB_CINERGYT2_QUERY_INTERVAL 250
+#define CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE 1
+#define CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL 100
+
+/*
+ * Supported FlexCopII (B2C2) Adapters
+ */
+#define CONFIG_DVB_B2C2_FLEXCOP_MODULE 1
+#define CONFIG_DVB_B2C2_FLEXCOP_PCI_MODULE 1
+#define CONFIG_DVB_B2C2_FLEXCOP_USB_MODULE 1
+#undef CONFIG_DVB_B2C2_FLEXCOP_DEBUG
+
+/*
+ * Supported BT878 Adapters
+ */
+#define CONFIG_DVB_BT8XX_MODULE 1
+
+/*
+ * Supported Pluto2 Adapters
+ */
+#define CONFIG_DVB_PLUTO2_MODULE 1
+
+/*
+ * Supported DVB Frontends
+ */
+
+/*
+ * Customise DVB Frontends
+ */
+
+/*
+ * DVB-S (satellite) frontends
+ */
+#define CONFIG_DVB_STV0299_MODULE 1
+#define CONFIG_DVB_CX24110_MODULE 1
+#define CONFIG_DVB_CX24123_MODULE 1
+#define CONFIG_DVB_TDA8083_MODULE 1
+#define CONFIG_DVB_MT312_MODULE 1
+#define CONFIG_DVB_VES1X93_MODULE 1
+#define CONFIG_DVB_S5H1420_MODULE 1
+
+/*
+ * DVB-T (terrestrial) frontends
+ */
+#define CONFIG_DVB_SP8870_MODULE 1
+#define CONFIG_DVB_SP887X_MODULE 1
+#define CONFIG_DVB_CX22700_MODULE 1
+#define CONFIG_DVB_CX22702_MODULE 1
+#define CONFIG_DVB_L64781_MODULE 1
+#define CONFIG_DVB_TDA1004X_MODULE 1
+#define CONFIG_DVB_NXT6000_MODULE 1
+#define CONFIG_DVB_MT352_MODULE 1
+#define CONFIG_DVB_ZL10353_MODULE 1
+#define CONFIG_DVB_DIB3000MB_MODULE 1
+#define CONFIG_DVB_DIB3000MC_MODULE 1
+
+/*
+ * DVB-C (cable) frontends
+ */
+#define CONFIG_DVB_VES1820_MODULE 1
+#define CONFIG_DVB_TDA10021_MODULE 1
+#define CONFIG_DVB_STV0297_MODULE 1
+
+/*
+ * ATSC (North American/Korean Terresterial DTV) frontends
+ */
+#define CONFIG_DVB_NXT200X_MODULE 1
+#define CONFIG_DVB_OR51211_MODULE 1
+#define CONFIG_DVB_OR51132_MODULE 1
+#define CONFIG_DVB_BCM3510_MODULE 1
+#define CONFIG_DVB_LGDT330X_MODULE 1
 #define CONFIG_VIDEO_SAA7146_MODULE 1
 #define CONFIG_VIDEO_SAA7146_VV_MODULE 1
 #define CONFIG_VIDEO_VIDEOBUF_MODULE 1
 #define CONFIG_VIDEO_TUNER_MODULE 1
 #define CONFIG_VIDEO_BUF_MODULE 1
+#define CONFIG_VIDEO_BUF_DVB_MODULE 1
 #define CONFIG_VIDEO_BTCX_MODULE 1
 #define CONFIG_VIDEO_IR_MODULE 1
+#define CONFIG_VIDEO_TVEEPROM_MODULE 1
+#define CONFIG_USB_DABUSB_MODULE 1
 
 /*
  * Graphics support
  */
 #define CONFIG_FB 1
+#define CONFIG_FB_CFB_FILLRECT 1
+#define CONFIG_FB_CFB_COPYAREA 1
+#define CONFIG_FB_CFB_IMAGEBLIT 1
+#undef CONFIG_FB_MACMODES
+#undef CONFIG_FB_FIRMWARE_EDID
+#define CONFIG_FB_MODE_HELPERS 1
+#define CONFIG_FB_TILEBLITTING 1
+#define CONFIG_FB_CIRRUS_MODULE 1
 #undef CONFIG_FB_PM2
 #undef CONFIG_FB_CYBER2000
+#undef CONFIG_FB_ARC
 #undef CONFIG_FB_ASILIANT
 #undef CONFIG_FB_IMSTT
 #define CONFIG_FB_VGA16_MODULE 1
 #define CONFIG_FB_VESA 1
 #define CONFIG_VIDEO_SELECT 1
-#define CONFIG_FB_HGA_MODULE 1
-#define CONFIG_FB_HGA_ACCEL 1
+#undef CONFIG_FB_HGA
+#undef CONFIG_FB_S1D13XXX
+#undef CONFIG_FB_NVIDIA
 #define CONFIG_FB_RIVA_MODULE 1
+#undef CONFIG_FB_RIVA_I2C
+#undef CONFIG_FB_RIVA_DEBUG
 #define CONFIG_FB_I810_MODULE 1
 #define CONFIG_FB_I810_GTF 1
+#define CONFIG_FB_I810_I2C 1
+#define CONFIG_FB_INTEL_MODULE 1
+#undef CONFIG_FB_INTEL_DEBUG
 #define CONFIG_FB_MATROX_MODULE 1
 #define CONFIG_FB_MATROX_MILLENIUM 1
 #define CONFIG_FB_MATROX_MYSTIQUE 1
-#define CONFIG_FB_MATROX_G450 1
-#define CONFIG_FB_MATROX_G100 1
+#define CONFIG_FB_MATROX_G 1
 #define CONFIG_FB_MATROX_I2C_MODULE 1
 #define CONFIG_FB_MATROX_MAVEN_MODULE 1
 #define CONFIG_FB_MATROX_MULTIHEAD 1
-#undef CONFIG_FB_RADEON_OLD
 #define CONFIG_FB_RADEON_MODULE 1
 #define CONFIG_FB_RADEON_I2C 1
 #undef CONFIG_FB_RADEON_DEBUG
 #define CONFIG_FB_ATY128_MODULE 1
 #define CONFIG_FB_ATY_MODULE 1
 #define CONFIG_FB_ATY_CT 1
+#define CONFIG_FB_ATY_GENERIC_LCD 1
 #define CONFIG_FB_ATY_GX 1
-#undef CONFIG_FB_ATY_XL_INIT
+#define CONFIG_FB_SAVAGE_MODULE 1
+#define CONFIG_FB_SAVAGE_I2C 1
+#define CONFIG_FB_SAVAGE_ACCEL 1
 #undef CONFIG_FB_SIS
 #define CONFIG_FB_NEOMAGIC_MODULE 1
 #define CONFIG_FB_KYRO_MODULE 1
 #define CONFIG_FB_3DFX_MODULE 1
 #define CONFIG_FB_3DFX_ACCEL 1
 #define CONFIG_FB_VOODOO1_MODULE 1
+#define CONFIG_FB_CYBLA_MODULE 1
 #define CONFIG_FB_TRIDENT_MODULE 1
 #define CONFIG_FB_TRIDENT_ACCEL 1
+#undef CONFIG_FB_GEODE
 #undef CONFIG_FB_VIRTUAL
 
 /*
  * Console display driver support
  */
 #define CONFIG_VGA_CONSOLE 1
-#define CONFIG_MDA_CONSOLE_MODULE 1
+#define CONFIG_VGACON_SOFT_SCROLLBACK 1
+#define CONFIG_VGACON_SOFT_SCROLLBACK_SIZE 64
+#undef CONFIG_MDA_CONSOLE
 #define CONFIG_DUMMY_CONSOLE 1
 #define CONFIG_FRAMEBUFFER_CONSOLE 1
-#define CONFIG_PCI_CONSOLE 1
+#define CONFIG_FRAMEBUFFER_CONSOLE_ROTATION 1
 #undef CONFIG_FONTS
 #define CONFIG_FONT_8x8 1
 #define CONFIG_FONT_8x16 1
@@ -1776,6 +2466,11 @@
 #undef CONFIG_LOGO_LINUX_MONO
 #undef CONFIG_LOGO_LINUX_VGA16
 #define CONFIG_LOGO_LINUX_CLUT224 1
+#define CONFIG_BACKLIGHT_LCD_SUPPORT 1
+#define CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE 1
+#define CONFIG_BACKLIGHT_DEVICE 1
+#define CONFIG_LCD_CLASS_DEVICE_MODULE 1
+#define CONFIG_LCD_DEVICE 1
 
 /*
  * Sound
@@ -1795,8 +2490,13 @@
 #define CONFIG_SND_OSSEMUL 1
 #define CONFIG_SND_MIXER_OSS_MODULE 1
 #define CONFIG_SND_PCM_OSS_MODULE 1
+#define CONFIG_SND_PCM_OSS_PLUGINS 1
 #define CONFIG_SND_SEQUENCER_OSS 1
 #define CONFIG_SND_RTCTIMER_MODULE 1
+#define CONFIG_SND_SEQ_RTCTIMER_DEFAULT 1
+#define CONFIG_SND_DYNAMIC_MINORS 1
+#undef CONFIG_SND_SUPPORT_OLD_API
+#define CONFIG_SND_VERBOSE_PROCFS 1
 #undef CONFIG_SND_VERBOSE_PRINTK
 #undef CONFIG_SND_DEBUG
 
@@ -1807,6 +2507,8 @@
 #define CONFIG_SND_OPL3_LIB_MODULE 1
 #define CONFIG_SND_OPL4_LIB_MODULE 1
 #define CONFIG_SND_VX_LIB_MODULE 1
+#define CONFIG_SND_AC97_CODEC_MODULE 1
+#define CONFIG_SND_AC97_BUS_MODULE 1
 #define CONFIG_SND_DUMMY_MODULE 1
 #define CONFIG_SND_VIRMIDI_MODULE 1
 #define CONFIG_SND_MTPAV_MODULE 1
@@ -1816,87 +2518,102 @@
 /*
  * ISA devices
  */
-#define CONFIG_SND_AD1816A_MODULE 1
-#define CONFIG_SND_AD1848_MODULE 1
-#define CONFIG_SND_CS4231_MODULE 1
-#define CONFIG_SND_CS4232_MODULE 1
+#define CONFIG_SND_CS4231_LIB_MODULE 1
+#define CONFIG_SND_ADLIB_MODULE 1
+#undef CONFIG_SND_AD1816A
+#undef CONFIG_SND_AD1848
+#undef CONFIG_SND_ALS100
+#undef CONFIG_SND_AZT2320
+#undef CONFIG_SND_CMI8330
+#undef CONFIG_SND_CS4231
+#undef CONFIG_SND_CS4232
 #define CONFIG_SND_CS4236_MODULE 1
-#define CONFIG_SND_ES968_MODULE 1
-#define CONFIG_SND_ES1688_MODULE 1
+#undef CONFIG_SND_DT019X
+#undef CONFIG_SND_ES968
+#undef CONFIG_SND_ES1688
 #define CONFIG_SND_ES18XX_MODULE 1
-#define CONFIG_SND_GUSCLASSIC_MODULE 1
-#define CONFIG_SND_GUSEXTREME_MODULE 1
-#define CONFIG_SND_GUSMAX_MODULE 1
-#define CONFIG_SND_INTERWAVE_MODULE 1
-#define CONFIG_SND_INTERWAVE_STB_MODULE 1
-#define CONFIG_SND_OPTI92X_AD1848_MODULE 1
-#define CONFIG_SND_OPTI92X_CS4231_MODULE 1
-#define CONFIG_SND_OPTI93X_MODULE 1
-#define CONFIG_SND_SB8_MODULE 1
+#undef CONFIG_SND_GUSCLASSIC
+#undef CONFIG_SND_GUSEXTREME
+#undef CONFIG_SND_GUSMAX
+#undef CONFIG_SND_INTERWAVE
+#undef CONFIG_SND_INTERWAVE_STB
+#define CONFIG_SND_OPL3SA2_MODULE 1
+#undef CONFIG_SND_OPTI92X_AD1848
+#undef CONFIG_SND_OPTI92X_CS4231
+#undef CONFIG_SND_OPTI93X
+#define CONFIG_SND_MIRO_MODULE 1
+#undef CONFIG_SND_SB8
 #define CONFIG_SND_SB16_MODULE 1
 #define CONFIG_SND_SBAWE_MODULE 1
-#define CONFIG_SND_SB16_CSP 1
+#undef CONFIG_SND_SB16_CSP
+#undef CONFIG_SND_SGALAXY
+#undef CONFIG_SND_SSCAPE
 #undef CONFIG_SND_WAVEFRONT
-#define CONFIG_SND_ALS100_MODULE 1
-#define CONFIG_SND_AZT2320_MODULE 1
-#define CONFIG_SND_CMI8330_MODULE 1
-#define CONFIG_SND_DT019X_MODULE 1
-#define CONFIG_SND_OPL3SA2_MODULE 1
-#define CONFIG_SND_SGALAXY_MODULE 1
-#define CONFIG_SND_SSCAPE_MODULE 1
 
 /*
  * PCI devices
  */
-#define CONFIG_SND_AC97_CODEC_MODULE 1
+#define CONFIG_SND_AD1889_MODULE 1
+#define CONFIG_SND_ALS300_MODULE 1
+#define CONFIG_SND_ALS4000_MODULE 1
 #define CONFIG_SND_ALI5451_MODULE 1
 #define CONFIG_SND_ATIIXP_MODULE 1
+#define CONFIG_SND_ATIIXP_MODEM_MODULE 1
 #define CONFIG_SND_AU8810_MODULE 1
 #define CONFIG_SND_AU8820_MODULE 1
 #define CONFIG_SND_AU8830_MODULE 1
 #define CONFIG_SND_AZT3328_MODULE 1
 #define CONFIG_SND_BT87X_MODULE 1
+#undef CONFIG_SND_BT87X_OVERCLOCK
+#define CONFIG_SND_CA0106_MODULE 1
+#define CONFIG_SND_CMIPCI_MODULE 1
+#define CONFIG_SND_CS4281_MODULE 1
 #define CONFIG_SND_CS46XX_MODULE 1
 #define CONFIG_SND_CS46XX_NEW_DSP 1
-#define CONFIG_SND_CS4281_MODULE 1
+#define CONFIG_SND_CS5535AUDIO_MODULE 1
 #define CONFIG_SND_EMU10K1_MODULE 1
-#define CONFIG_SND_KORG1212_MODULE 1
-#define CONFIG_SND_MIXART_MODULE 1
-#define CONFIG_SND_NM256_MODULE 1
-#define CONFIG_SND_RME32_MODULE 1
-#define CONFIG_SND_RME96_MODULE 1
-#define CONFIG_SND_RME9652_MODULE 1
-#define CONFIG_SND_HDSP_MODULE 1
-#define CONFIG_SND_TRIDENT_MODULE 1
-#define CONFIG_SND_YMFPCI_MODULE 1
-#define CONFIG_SND_ALS4000_MODULE 1
-#define CONFIG_SND_CMIPCI_MODULE 1
+#define CONFIG_SND_EMU10K1X_MODULE 1
 #define CONFIG_SND_ENS1370_MODULE 1
 #define CONFIG_SND_ENS1371_MODULE 1
 #define CONFIG_SND_ES1938_MODULE 1
 #define CONFIG_SND_ES1968_MODULE 1
-#define CONFIG_SND_MAESTRO3_MODULE 1
 #define CONFIG_SND_FM801_MODULE 1
+#define CONFIG_SND_FM801_TEA575X_BOOL 1
 #define CONFIG_SND_FM801_TEA575X_MODULE 1
+#define CONFIG_SND_HDA_INTEL_MODULE 1
+#define CONFIG_SND_HDSP_MODULE 1
+#define CONFIG_SND_HDSPM_MODULE 1
 #define CONFIG_SND_ICE1712_MODULE 1
 #define CONFIG_SND_ICE1724_MODULE 1
 #define CONFIG_SND_INTEL8X0_MODULE 1
 #define CONFIG_SND_INTEL8X0M_MODULE 1
+#define CONFIG_SND_KORG1212_MODULE 1
+#define CONFIG_SND_MAESTRO3_MODULE 1
+#define CONFIG_SND_MIXART_MODULE 1
+#define CONFIG_SND_NM256_MODULE 1
+#define CONFIG_SND_PCXHR_MODULE 1
+#define CONFIG_SND_RIPTIDE_MODULE 1
+#define CONFIG_SND_RME32_MODULE 1
+#define CONFIG_SND_RME96_MODULE 1
+#define CONFIG_SND_RME9652_MODULE 1
 #define CONFIG_SND_SONICVIBES_MODULE 1
+#define CONFIG_SND_TRIDENT_MODULE 1
 #define CONFIG_SND_VIA82XX_MODULE 1
+#define CONFIG_SND_VIA82XX_MODEM_MODULE 1
 #define CONFIG_SND_VX222_MODULE 1
+#define CONFIG_SND_YMFPCI_MODULE 1
 
 /*
- * ALSA USB devices
+ * USB devices
  */
 #define CONFIG_SND_USB_AUDIO_MODULE 1
+#define CONFIG_SND_USB_USX2Y_MODULE 1
 
 /*
  * PCMCIA devices
  */
 #undef CONFIG_SND_VXPOCKET
-#undef CONFIG_SND_VXP440
-#define CONFIG_SND_PDAUDIOCF_MODULE 1
+#undef CONFIG_SND_PDAUDIOCF
 
 /*
  * Open Sound System
@@ -1906,6 +2623,9 @@
 /*
  * USB support
  */
+#define CONFIG_USB_ARCH_HAS_HCD 1
+#define CONFIG_USB_ARCH_HAS_OHCI 1
+#define CONFIG_USB_ARCH_HAS_EHCI 1
 #define CONFIG_USB 1
 #undef CONFIG_USB_DEBUG
 
@@ -1915,6 +2635,8 @@
 #define CONFIG_USB_DEVICEFS 1
 #undef CONFIG_USB_BANDWIDTH
 #undef CONFIG_USB_DYNAMIC_MINORS
+#undef CONFIG_USB_SUSPEND
+#undef CONFIG_USB_OTG
 
 /*
  * USB Host Controller Drivers
@@ -1922,36 +2644,46 @@
 #define CONFIG_USB_EHCI_HCD_MODULE 1
 #define CONFIG_USB_EHCI_SPLIT_ISO 1
 #define CONFIG_USB_EHCI_ROOT_HUB_TT 1
+#define CONFIG_USB_ISP116X_HCD_MODULE 1
 #define CONFIG_USB_OHCI_HCD_MODULE 1
+#undef CONFIG_USB_OHCI_BIG_ENDIAN
+#define CONFIG_USB_OHCI_LITTLE_ENDIAN 1
 #define CONFIG_USB_UHCI_HCD_MODULE 1
+#define CONFIG_USB_SL811_HCD_MODULE 1
+#define CONFIG_USB_SL811_CS_MODULE 1
 
 /*
  * USB Device Class drivers
  */
-#define CONFIG_USB_AUDIO_MODULE 1
+#define CONFIG_USB_ACM_MODULE 1
+#define CONFIG_USB_PRINTER_MODULE 1
 
 /*
- * USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
+ * NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+ */
+
+/*
+ * may also be needed; see USB_STORAGE Help for more information
  */
-#define CONFIG_USB_MIDI_MODULE 1
-#define CONFIG_USB_ACM_MODULE 1
-#define CONFIG_USB_PRINTER_MODULE 1
 #define CONFIG_USB_STORAGE_MODULE 1
 #undef CONFIG_USB_STORAGE_DEBUG
 #define CONFIG_USB_STORAGE_DATAFAB 1
 #define CONFIG_USB_STORAGE_FREECOM 1
 #define CONFIG_USB_STORAGE_ISD200 1
 #define CONFIG_USB_STORAGE_DPCM 1
-#define CONFIG_USB_STORAGE_HP8200e 1
+#define CONFIG_USB_STORAGE_USBAT 1
 #define CONFIG_USB_STORAGE_SDDR09 1
 #define CONFIG_USB_STORAGE_SDDR55 1
 #define CONFIG_USB_STORAGE_JUMPSHOT 1
+#define CONFIG_USB_STORAGE_ALAUDA 1
+#define CONFIG_USB_LIBUSUAL 1
 
 /*
- * USB Human Interface Devices (HID)
+ * USB Input Devices
  */
 #define CONFIG_USB_HID 1
 #define CONFIG_USB_HIDINPUT 1
+#undef CONFIG_USB_HIDINPUT_POWERBOOK
 #define CONFIG_HID_FF 1
 #define CONFIG_HID_PID 1
 #define CONFIG_LOGITECH_FF 1
@@ -1959,64 +2691,50 @@
 #define CONFIG_USB_HIDDEV 1
 #define CONFIG_USB_AIPTEK_MODULE 1
 #define CONFIG_USB_WACOM_MODULE 1
+#define CONFIG_USB_ACECAD_MODULE 1
 #define CONFIG_USB_KBTAB_MODULE 1
 #define CONFIG_USB_POWERMATE_MODULE 1
-#define CONFIG_USB_MTOUCH_MODULE 1
-#define CONFIG_USB_EGALAX_MODULE 1
+#define CONFIG_USB_TOUCHSCREEN_MODULE 1
+#define CONFIG_USB_TOUCHSCREEN_EGALAX 1
+#define CONFIG_USB_TOUCHSCREEN_PANJIT 1
+#define CONFIG_USB_TOUCHSCREEN_3M 1
+#define CONFIG_USB_TOUCHSCREEN_ITM 1
+#undef CONFIG_USB_YEALINK
 #define CONFIG_USB_XPAD_MODULE 1
 #define CONFIG_USB_ATI_REMOTE_MODULE 1
+#define CONFIG_USB_ATI_REMOTE2_MODULE 1
+#define CONFIG_USB_KEYSPAN_REMOTE_MODULE 1
+#define CONFIG_USB_APPLETOUCH_MODULE 1
 
 /*
  * USB Imaging devices
  */
 #define CONFIG_USB_MDC800_MODULE 1
 #define CONFIG_USB_MICROTEK_MODULE 1
-#define CONFIG_USB_HPUSBSCSI_MODULE 1
-
-/*
- * USB Multimedia devices
- */
-#define CONFIG_USB_DABUSB_MODULE 1
-#define CONFIG_USB_VICAM_MODULE 1
-#define CONFIG_USB_DSBR_MODULE 1
-#define CONFIG_USB_IBMCAM_MODULE 1
-#define CONFIG_USB_KONICAWC_MODULE 1
-#define CONFIG_USB_OV511_MODULE 1
-#define CONFIG_USB_SE401_MODULE 1
-#define CONFIG_USB_STV680_MODULE 1
-#define CONFIG_USB_W9968CF_MODULE 1
 
 /*
- * USB Network adaptors
+ * USB Network Adapters
  */
 #define CONFIG_USB_CATC_MODULE 1
 #define CONFIG_USB_KAWETH_MODULE 1
 #define CONFIG_USB_PEGASUS_MODULE 1
 #define CONFIG_USB_RTL8150_MODULE 1
 #define CONFIG_USB_USBNET_MODULE 1
-
-/*
- * USB Host-to-Host Cables
- */
+#define CONFIG_USB_NET_AX8817X_MODULE 1
+#define CONFIG_USB_NET_CDCETHER_MODULE 1
+#define CONFIG_USB_NET_GL620A_MODULE 1
+#define CONFIG_USB_NET_NET1080_MODULE 1
+#define CONFIG_USB_NET_PLUSB_MODULE 1
+#define CONFIG_USB_NET_RNDIS_HOST_MODULE 1
+#define CONFIG_USB_NET_CDC_SUBSET_MODULE 1
 #define CONFIG_USB_ALI_M5632 1
 #define CONFIG_USB_AN2720 1
 #define CONFIG_USB_BELKIN 1
-#define CONFIG_USB_GENESYS 1
-#define CONFIG_USB_NET1080 1
-#define CONFIG_USB_PL2301 1
-
-/*
- * Intelligent USB Devices/Gadgets
- */
 #define CONFIG_USB_ARMLINUX 1
 #define CONFIG_USB_EPSON2888 1
-#define CONFIG_USB_ZAURUS 1
-#define CONFIG_USB_CDCETHER 1
-
-/*
- * USB Network Adapters
- */
-#define CONFIG_USB_AX8817X 1
+#define CONFIG_USB_NET_ZAURUS_MODULE 1
+#define CONFIG_USB_ZD1201_MODULE 1
+#define CONFIG_USB_MON 1
 
 /*
  * USB port drivers
@@ -2028,15 +2746,24 @@
  */
 #define CONFIG_USB_SERIAL_MODULE 1
 #define CONFIG_USB_SERIAL_GENERIC 1
+#define CONFIG_USB_SERIAL_AIRPRIME_MODULE 1
+#define CONFIG_USB_SERIAL_ANYDATA_MODULE 1
+#define CONFIG_USB_SERIAL_ARK3116_MODULE 1
 #define CONFIG_USB_SERIAL_BELKIN_MODULE 1
+#define CONFIG_USB_SERIAL_WHITEHEAT_MODULE 1
 #define CONFIG_USB_SERIAL_DIGI_ACCELEPORT_MODULE 1
+#define CONFIG_USB_SERIAL_CP2101_MODULE 1
+#define CONFIG_USB_SERIAL_CYPRESS_M8_MODULE 1
 #define CONFIG_USB_SERIAL_EMPEG_MODULE 1
 #define CONFIG_USB_SERIAL_FTDI_SIO_MODULE 1
+#define CONFIG_USB_SERIAL_FUNSOFT_MODULE 1
 #define CONFIG_USB_SERIAL_VISOR_MODULE 1
 #define CONFIG_USB_SERIAL_IPAQ_MODULE 1
 #define CONFIG_USB_SERIAL_IR_MODULE 1
 #define CONFIG_USB_SERIAL_EDGEPORT_MODULE 1
 #define CONFIG_USB_SERIAL_EDGEPORT_TI_MODULE 1
+#define CONFIG_USB_SERIAL_GARMIN_MODULE 1
+#define CONFIG_USB_SERIAL_IPW_MODULE 1
 #define CONFIG_USB_SERIAL_KEYSPAN_PDA_MODULE 1
 #define CONFIG_USB_SERIAL_KEYSPAN_MODULE 1
 #define CONFIG_USB_SERIAL_KEYSPAN_MPR 1
@@ -2054,11 +2781,15 @@
 #define CONFIG_USB_SERIAL_KLSI_MODULE 1
 #define CONFIG_USB_SERIAL_KOBIL_SCT_MODULE 1
 #define CONFIG_USB_SERIAL_MCT_U232_MODULE 1
+#define CONFIG_USB_SERIAL_NAVMAN_MODULE 1
 #define CONFIG_USB_SERIAL_PL2303_MODULE 1
+#define CONFIG_USB_SERIAL_HP4X_MODULE 1
 #define CONFIG_USB_SERIAL_SAFE_MODULE 1
 #define CONFIG_USB_SERIAL_SAFE_PADDED 1
+#define CONFIG_USB_SERIAL_TI_MODULE 1
 #define CONFIG_USB_SERIAL_CYBERJACK_MODULE 1
 #define CONFIG_USB_SERIAL_XIRCOM_MODULE 1
+#define CONFIG_USB_SERIAL_OPTION_MODULE 1
 #define CONFIG_USB_SERIAL_OMNINET_MODULE 1
 #define CONFIG_USB_EZUSB 1
 
@@ -2066,22 +2797,111 @@
  * USB Miscellaneous drivers
  */
 #define CONFIG_USB_EMI62_MODULE 1
-#undef CONFIG_USB_EMI26
-#define CONFIG_USB_TIGL_MODULE 1
+#define CONFIG_USB_EMI26_MODULE 1
 #define CONFIG_USB_AUERSWALD_MODULE 1
 #define CONFIG_USB_RIO500_MODULE 1
 #define CONFIG_USB_LEGOTOWER_MODULE 1
 #define CONFIG_USB_LCD_MODULE 1
 #define CONFIG_USB_LED_MODULE 1
 #undef CONFIG_USB_CYTHERM
+#define CONFIG_USB_PHIDGETKIT_MODULE 1
 #define CONFIG_USB_PHIDGETSERVO_MODULE 1
+#define CONFIG_USB_IDMOUSE_MODULE 1
+#define CONFIG_USB_SISUSBVGA_MODULE 1
+#define CONFIG_USB_SISUSBVGA_CON 1
+#define CONFIG_USB_LD_MODULE 1
 #define CONFIG_USB_TEST_MODULE 1
 
+/*
+ * USB DSL modem support
+ */
+#define CONFIG_USB_ATM_MODULE 1
+#define CONFIG_USB_SPEEDTOUCH_MODULE 1
+#define CONFIG_USB_CXACRU_MODULE 1
+#define CONFIG_USB_UEAGLEATM_MODULE 1
+#define CONFIG_USB_XUSBATM_MODULE 1
+
 /*
  * USB Gadget Support
  */
 #undef CONFIG_USB_GADGET
 
+/*
+ * MMC/SD Card support
+ */
+#define CONFIG_MMC_MODULE 1
+#undef CONFIG_MMC_DEBUG
+#define CONFIG_MMC_BLOCK_MODULE 1
+#define CONFIG_MMC_SDHCI_MODULE 1
+#define CONFIG_MMC_WBSD_MODULE 1
+
+/*
+ * LED devices
+ */
+#undef CONFIG_NEW_LEDS
+
+/*
+ * LED drivers
+ */
+
+/*
+ * LED Triggers
+ */
+
+/*
+ * InfiniBand support
+ */
+#define CONFIG_INFINIBAND_MODULE 1
+#define CONFIG_INFINIBAND_USER_MAD_MODULE 1
+#define CONFIG_INFINIBAND_USER_ACCESS_MODULE 1
+#define CONFIG_INFINIBAND_MTHCA_MODULE 1
+#define CONFIG_INFINIBAND_MTHCA_DEBUG 1
+#define CONFIG_INFINIBAND_IPOIB_MODULE 1
+#define CONFIG_INFINIBAND_IPOIB_DEBUG 1
+#define CONFIG_INFINIBAND_IPOIB_DEBUG_DATA 1
+#define CONFIG_INFINIBAND_SRP_MODULE 1
+
+/*
+ * EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
+ */
+#define CONFIG_EDAC 1
+
+/*
+ * Reporting subsystems
+ */
+#undef CONFIG_EDAC_DEBUG
+#define CONFIG_EDAC_MM_EDAC_MODULE 1
+#define CONFIG_EDAC_AMD76X_MODULE 1
+#define CONFIG_EDAC_E7XXX_MODULE 1
+#define CONFIG_EDAC_E752X_MODULE 1
+#define CONFIG_EDAC_I82875P_MODULE 1
+#define CONFIG_EDAC_I82860_MODULE 1
+#define CONFIG_EDAC_R82600_MODULE 1
+#define CONFIG_EDAC_POLL 1
+
+/*
+ * Real Time Clock
+ */
+#define CONFIG_RTC_LIB_MODULE 1
+#define CONFIG_RTC_CLASS_MODULE 1
+
+/*
+ * RTC interfaces
+ */
+#define CONFIG_RTC_INTF_SYSFS_MODULE 1
+#define CONFIG_RTC_INTF_PROC_MODULE 1
+#define CONFIG_RTC_INTF_DEV_MODULE 1
+
+/*
+ * RTC drivers
+ */
+#define CONFIG_RTC_DRV_X1205_MODULE 1
+#define CONFIG_RTC_DRV_DS1672_MODULE 1
+#define CONFIG_RTC_DRV_PCF8563_MODULE 1
+#define CONFIG_RTC_DRV_RS5C372_MODULE 1
+#undef CONFIG_RTC_DRV_M48T86
+#undef CONFIG_RTC_DRV_TEST
+
 /*
  * File systems
  */
@@ -2089,6 +2909,8 @@
 #define CONFIG_EXT2_FS_XATTR 1
 #define CONFIG_EXT2_FS_POSIX_ACL 1
 #define CONFIG_EXT2_FS_SECURITY 1
+#define CONFIG_EXT2_FS_XIP 1
+#define CONFIG_FS_XIP 1
 #define CONFIG_EXT3_FS_MODULE 1
 #define CONFIG_EXT3_FS_XATTR 1
 #define CONFIG_EXT3_FS_POSIX_ACL 1
@@ -2104,22 +2926,28 @@
 #define CONFIG_REISERFS_FS_SECURITY 1
 #define CONFIG_JFS_FS_MODULE 1
 #define CONFIG_JFS_POSIX_ACL 1
+#define CONFIG_JFS_SECURITY 1
 #undef CONFIG_JFS_DEBUG
 #undef CONFIG_JFS_STATISTICS
 #define CONFIG_FS_POSIX_ACL 1
 #define CONFIG_XFS_FS_MODULE 1
-#undef CONFIG_XFS_RT
+#define CONFIG_XFS_EXPORT 1
 #define CONFIG_XFS_QUOTA 1
 #define CONFIG_XFS_SECURITY 1
 #define CONFIG_XFS_POSIX_ACL 1
+#undef CONFIG_XFS_RT
+#define CONFIG_OCFS2_FS_MODULE 1
 #define CONFIG_MINIX_FS_MODULE 1
 #define CONFIG_ROMFS_FS_MODULE 1
+#define CONFIG_INOTIFY 1
 #define CONFIG_QUOTA 1
 #undef CONFIG_QFMT_V1
 #define CONFIG_QFMT_V2 1
 #define CONFIG_QUOTACTL 1
+#define CONFIG_DNOTIFY 1
 #define CONFIG_AUTOFS_FS_MODULE 1
 #define CONFIG_AUTOFS4_FS_MODULE 1
+#define CONFIG_FUSE_FS_MODULE 1
 
 /*
  * CD-ROM/DVD Filesystems
@@ -2129,6 +2957,7 @@
 #define CONFIG_ZISOFS 1
 #define CONFIG_ZISOFS_FS 1
 #define CONFIG_UDF_FS_MODULE 1
+#define CONFIG_UDF_NLS 1
 
 /*
  * DOS/FAT/NT Filesystems
@@ -2136,6 +2965,8 @@
 #define CONFIG_FAT_FS_MODULE 1
 #define CONFIG_MSDOS_FS_MODULE 1
 #define CONFIG_VFAT_FS_MODULE 1
+#define CONFIG_FAT_DEFAULT_CODEPAGE 437
+#define CONFIG_FAT_DEFAULT_IOCHARSET "ascii"
 #undef CONFIG_NTFS_FS
 
 /*
@@ -2144,13 +2975,11 @@
 #define CONFIG_PROC_FS 1
 #define CONFIG_PROC_KCORE 1
 #define CONFIG_SYSFS 1
-#undef CONFIG_DEVFS_FS
-#define CONFIG_DEVPTS_FS_XATTR 1
-#define CONFIG_DEVPTS_FS_SECURITY 1
 #define CONFIG_TMPFS 1
 #define CONFIG_HUGETLBFS 1
 #define CONFIG_HUGETLB_PAGE 1
 #define CONFIG_RAMFS 1
+#define CONFIG_CONFIGFS_FS_MODULE 1
 
 /*
  * Miscellaneous filesystems
@@ -2166,37 +2995,52 @@
 #undef CONFIG_JFFS_FS
 #define CONFIG_JFFS2_FS_MODULE 1
 #define CONFIG_JFFS2_FS_DEBUG 0
-#define CONFIG_JFFS2_FS_NAND 1
+#define CONFIG_JFFS2_FS_WRITEBUFFER 1
+#define CONFIG_JFFS2_SUMMARY 1
+#undef CONFIG_JFFS2_COMPRESSION_OPTIONS
+#define CONFIG_JFFS2_ZLIB 1
+#define CONFIG_JFFS2_RTIME 1
+#undef CONFIG_JFFS2_RUBIN
 #define CONFIG_CRAMFS_MODULE 1
+#define CONFIG_SQUASHFS_MODULE 1
+#undef CONFIG_SQUASHFS_EMBEDDED
+#define CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE 3
+#undef CONFIG_SQUASHFS_VMALLOC
 #define CONFIG_VXFS_FS_MODULE 1
 #undef CONFIG_HPFS_FS
 #define CONFIG_QNX4FS_FS_MODULE 1
-#undef CONFIG_QNX4FS_RW
 #define CONFIG_SYSV_FS_MODULE 1
 #define CONFIG_UFS_FS_MODULE 1
-#undef CONFIG_UFS_FS_WRITE
 
 /*
  * Network File Systems
  */
 #define CONFIG_NFS_FS_MODULE 1
 #define CONFIG_NFS_V3 1
+#define CONFIG_NFS_V3_ACL 1
 #define CONFIG_NFS_V4 1
 #define CONFIG_NFS_DIRECTIO 1
 #define CONFIG_NFSD_MODULE 1
+#define CONFIG_NFSD_V2_ACL 1
 #define CONFIG_NFSD_V3 1
+#define CONFIG_NFSD_V3_ACL 1
 #define CONFIG_NFSD_V4 1
 #define CONFIG_NFSD_TCP 1
 #define CONFIG_LOCKD_MODULE 1
 #define CONFIG_LOCKD_V4 1
 #define CONFIG_EXPORTFS_MODULE 1
+#define CONFIG_NFS_ACL_SUPPORT_MODULE 1
+#define CONFIG_NFS_COMMON 1
 #define CONFIG_SUNRPC_MODULE 1
 #define CONFIG_SUNRPC_GSS_MODULE 1
 #define CONFIG_RPCSEC_GSS_KRB5_MODULE 1
-#define CONFIG_SMB_FS_MODULE 1
-#undef CONFIG_SMB_NLS_DEFAULT
+#define CONFIG_RPCSEC_GSS_SPKM3_MODULE 1
+#undef CONFIG_SMB_FS
 #define CONFIG_CIFS_MODULE 1
 #undef CONFIG_CIFS_STATS
+#define CONFIG_CIFS_XATTR 1
+#define CONFIG_CIFS_POSIX 1
+#undef CONFIG_CIFS_EXPERIMENTAL
 #define CONFIG_NCP_FS_MODULE 1
 #define CONFIG_NCPFS_PACKET_SIGNING 1
 #define CONFIG_NCPFS_IOCTL_LOCKING 1
@@ -2206,8 +3050,10 @@
 #define CONFIG_NCPFS_SMALLDOS 1
 #define CONFIG_NCPFS_NLS 1
 #define CONFIG_NCPFS_EXTRAS 1
-#undef CONFIG_CODA_FS
+#define CONFIG_CODA_FS_MODULE 1
+#undef CONFIG_CODA_FS_OLD_API
 #undef CONFIG_AFS_FS
+#define CONFIG_9P_FS_MODULE 1
 
 /*
  * Partition Types
@@ -2215,7 +3061,7 @@
 #define CONFIG_PARTITION_ADVANCED 1
 #undef CONFIG_ACORN_PARTITION
 #define CONFIG_OSF_PARTITION 1
-#undef CONFIG_AMIGA_PARTITION
+#define CONFIG_AMIGA_PARTITION 1
 #undef CONFIG_ATARI_PARTITION
 #define CONFIG_MAC_PARTITION 1
 #define CONFIG_MSDOS_PARTITION 1
@@ -2224,10 +3070,10 @@
 #define CONFIG_SOLARIS_X86_PARTITION 1
 #define CONFIG_UNIXWARE_DISKLABEL 1
 #undef CONFIG_LDM_PARTITION
-#undef CONFIG_NEC98_PARTITION
 #define CONFIG_SGI_PARTITION 1
 #undef CONFIG_ULTRIX_PARTITION
 #define CONFIG_SUN_PARTITION 1
+#define CONFIG_KARMA_PARTITION 1
 #define CONFIG_EFI_PARTITION 1
 
 /*
@@ -2235,7 +3081,7 @@
  */
 #define CONFIG_NLS 1
 #define CONFIG_NLS_DEFAULT "utf8"
-#define CONFIG_NLS_CODEPAGE_437_MODULE 1
+#define CONFIG_NLS_CODEPAGE_437 1
 #define CONFIG_NLS_CODEPAGE_737_MODULE 1
 #define CONFIG_NLS_CODEPAGE_775_MODULE 1
 #define CONFIG_NLS_CODEPAGE_850_MODULE 1
@@ -2258,6 +3104,7 @@
 #define CONFIG_NLS_ISO8859_8_MODULE 1
 #define CONFIG_NLS_CODEPAGE_1250_MODULE 1
 #define CONFIG_NLS_CODEPAGE_1251_MODULE 1
+#define CONFIG_NLS_ASCII 1
 #define CONFIG_NLS_ISO8859_1_MODULE 1
 #define CONFIG_NLS_ISO8859_2_MODULE 1
 #define CONFIG_NLS_ISO8859_3_MODULE 1
@@ -2274,41 +3121,68 @@
 #define CONFIG_NLS_UTF8_MODULE 1
 
 /*
- * Profiling support
+ * Instrumentation Support
  */
 #define CONFIG_PROFILING 1
 #define CONFIG_OPROFILE_MODULE 1
+#define CONFIG_KPROBES 1
 
 /*
  * Kernel hacking
  */
+#undef CONFIG_PRINTK_TIME
+#define CONFIG_MAGIC_SYSRQ 1
 #define CONFIG_DEBUG_KERNEL 1
-#define CONFIG_EARLY_PRINTK 1
-#define CONFIG_DEBUG_STACKOVERFLOW 1
-#undef CONFIG_DEBUG_STACK_USAGE
+#define CONFIG_LOG_BUF_SHIFT 17
+#define CONFIG_DETECT_SOFTLOCKUP 1
+#define CONFIG_SCHEDSTATS 1
 #undef CONFIG_DEBUG_SLAB
-#define CONFIG_MAGIC_SYSRQ 1
-#undef CONFIG_DEBUG_SPINLOCK
-#undef CONFIG_DEBUG_PAGEALLOC
-#undef CONFIG_DEBUG_HIGHMEM
-#define CONFIG_DEBUG_INFO 1
+#define CONFIG_DEBUG_MUTEXES 1
+#define CONFIG_DEBUG_SPINLOCK 1
 #define CONFIG_DEBUG_SPINLOCK_SLEEP 1
+#undef CONFIG_DEBUG_KOBJECT
+#define CONFIG_DEBUG_HIGHMEM 1
+#define CONFIG_DEBUG_BUGVERBOSE 1
+#define CONFIG_DEBUG_INFO 1
+#define CONFIG_DEBUG_FS 1
+#define CONFIG_DEBUG_VM 1
 #undef CONFIG_FRAME_POINTER
+#define CONFIG_UNWIND_INFO 1
+#undef CONFIG_FORCED_INLINING
+#define CONFIG_BOOT_DELAY 1
+#undef CONFIG_RCU_TORTURE_TEST
+#define CONFIG_EARLY_PRINTK 1
+#define CONFIG_DEBUG_STACKOVERFLOW 1
+#define CONFIG_DEBUG_STACK_USAGE 1
+#define CONFIG_STACK_BACKTRACE_COLS 2
+
+/*
+ * Page alloc debug is incompatible with Software Suspend on i386
+ */
+#define CONFIG_DEBUG_RODATA 1
+#define CONFIG_4KSTACKS 1
 #define CONFIG_X86_FIND_SMP_CONFIG 1
 #define CONFIG_X86_MPPARSE 1
+#define CONFIG_DOUBLEFAULT 1
 
 /*
  * Security options
  */
+#define CONFIG_KEYS 1
+#define CONFIG_KEYS_DEBUG_PROC_KEYS 1
 #define CONFIG_SECURITY 1
 #define CONFIG_SECURITY_NETWORK 1
+#define CONFIG_SECURITY_NETWORK_XFRM 1
 #define CONFIG_SECURITY_CAPABILITIES 1
 #undef CONFIG_SECURITY_ROOTPLUG
+#undef CONFIG_SECURITY_SECLVL
 #define CONFIG_SECURITY_SELINUX 1
 #define CONFIG_SECURITY_SELINUX_BOOTPARAM 1
+#define CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE 1
 #define CONFIG_SECURITY_SELINUX_DISABLE 1
 #define CONFIG_SECURITY_SELINUX_DEVELOP 1
-#undef CONFIG_SECURITY_SELINUX_MLS
+#define CONFIG_SECURITY_SELINUX_AVC_STATS 1
+#define CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE 1
 
 /*
  * Cryptographic options
@@ -2318,32 +3192,51 @@
 #define CONFIG_CRYPTO_NULL_MODULE 1
 #define CONFIG_CRYPTO_MD4_MODULE 1
 #define CONFIG_CRYPTO_MD5 1
-#define CONFIG_CRYPTO_SHA1_MODULE 1
+#define CONFIG_CRYPTO_SHA1 1
 #define CONFIG_CRYPTO_SHA256_MODULE 1
 #define CONFIG_CRYPTO_SHA512_MODULE 1
+#define CONFIG_CRYPTO_WP512_MODULE 1
+#define CONFIG_CRYPTO_TGR192_MODULE 1
 #define CONFIG_CRYPTO_DES_MODULE 1
 #define CONFIG_CRYPTO_BLOWFISH_MODULE 1
 #define CONFIG_CRYPTO_TWOFISH_MODULE 1
 #define CONFIG_CRYPTO_SERPENT_MODULE 1
 #define CONFIG_CRYPTO_AES_MODULE 1
+#define CONFIG_CRYPTO_AES_586_MODULE 1
 #define CONFIG_CRYPTO_CAST5_MODULE 1
 #define CONFIG_CRYPTO_CAST6_MODULE 1
+#define CONFIG_CRYPTO_TEA_MODULE 1
 #define CONFIG_CRYPTO_ARC4_MODULE 1
+#define CONFIG_CRYPTO_KHAZAD_MODULE 1
+#define CONFIG_CRYPTO_ANUBIS_MODULE 1
 #define CONFIG_CRYPTO_DEFLATE_MODULE 1
 #define CONFIG_CRYPTO_MICHAEL_MIC_MODULE 1
 #define CONFIG_CRYPTO_CRC32C_MODULE 1
 #undef CONFIG_CRYPTO_TEST
+#define CONFIG_CRYPTO_SIGNATURE 1
+#define CONFIG_CRYPTO_SIGNATURE_DSA 1
+#define CONFIG_CRYPTO_MPILIB 1
+
+/*
+ * Hardware crypto devices
+ */
+#define CONFIG_CRYPTO_DEV_PADLOCK_MODULE 1
+#define CONFIG_CRYPTO_DEV_PADLOCK_AES 1
 
 /*
  * Library routines
  */
+#define CONFIG_CRC_CCITT_MODULE 1
+#define CONFIG_CRC16_MODULE 1
 #define CONFIG_CRC32 1
 #define CONFIG_LIBCRC32C_MODULE 1
 #define CONFIG_ZLIB_INFLATE 1
 #define CONFIG_ZLIB_DEFLATE_MODULE 1
-#define CONFIG_X86_SMP 1
-#define CONFIG_X86_HT 1
+#define CONFIG_TEXTSEARCH 1
+#define CONFIG_TEXTSEARCH_KMP_MODULE 1
+#define CONFIG_TEXTSEARCH_BM_MODULE 1
+#define CONFIG_TEXTSEARCH_FSM_MODULE 1
+#define CONFIG_GENERIC_HARDIRQS 1
+#define CONFIG_GENERIC_IRQ_PROBE 1
 #define CONFIG_X86_BIOS_REBOOT 1
-#define CONFIG_X86_TRAMPOLINE 1
-#define CONFIG_X86_STD_RESOURCES 1
-#define CONFIG_PC 1
+#define CONFIG_KTIME_SCALAR 1