UBUNTU: SAUCE: Re-enable RODATA for i386 virtual

[linux-flexiantxendom0-natty.git] / debian.master / config / config.common.ubuntu

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 6a9f187..5a8a56f 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -230,6 +230,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_IOP13XX is not set
@@ -346,6 +347,7 @@ CONFIG_ATA_BMDMA=y
 CONFIG_ATA_OVER_ETH=m
 CONFIG_ATA_SFF=y
 CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
 CONFIG_ATH5K_PCI=y
 # CONFIG_ATH6K_LEGACY is not set
@@ -501,7 +503,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BITREVERSE=y
 CONFIG_BKL=y
-# CONFIG_BLK_CGROUP is not set
+CONFIG_BLK_CGROUP=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_DEV=y
@@ -543,6 +545,7 @@ CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_JMICRON is not set
+CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
@@ -559,10 +562,10 @@ CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_SIIMAGE is not set
 # CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
-# CONFIG_BLK_DEV_SR_VENDOR is not set
 # CONFIG_BLK_DEV_SVWKS is not set
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_TC86C001 is not set
+CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_UB is not set
@@ -581,7 +584,7 @@ CONFIG_BONDING=m
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_BOOTX_TEXT is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPQETHER=m
 CONFIG_BRANCH_PROFILE_NONE=y
@@ -691,6 +694,8 @@ CONFIG_CAPI_AVM=y
 CONFIG_CAPI_EICON=y
 CONFIG_CAPI_TRACE=y
 CONFIG_CARDBUS=y
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
 CONFIG_CARL9170=m
 # CONFIG_CARL9170_DEBUGFS is not set
 CONFIG_CARL9170_LEDS=y
@@ -715,7 +720,9 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
+CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CGROUPS=y
+CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
@@ -755,6 +762,7 @@ CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMM=y
 CONFIG_CMPXCHG_LOCAL=y
 CONFIG_CNIC=m
 CONFIG_CODA_FS=m
@@ -894,6 +902,7 @@ CONFIG_COMPAT_NETLINK_MESSAGES=y
 # CONFIG_COMPAT_VDSO is not set
 CONFIG_COMPUTONE=m
 CONFIG_CONFIGFS_FS=m
+CONFIG_CONNECTOR=y
 CONFIG_CONSOLE_POLL=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONSTRUCTORS=y
@@ -947,7 +956,6 @@ CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
 CONFIG_CRAMFS=m
-# CONFIG_CRASH_DUMP is not set
 CONFIG_CRC16=y
 CONFIG_CRC32=y
 CONFIG_CRC7=m
@@ -975,7 +983,7 @@ CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_DEFLATE=m
@@ -1057,6 +1065,7 @@ CONFIG_DE4X5=m
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_DEBUGGER=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_BOOT_PARAMS is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -1085,6 +1094,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y
@@ -1110,6 +1120,7 @@ CONFIG_DECOMPRESS_LZO=y
 CONFIG_DECOMPRESS_XZ=y
 CONFIG_DEFAULT_CUBIC=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=1
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_SECURITY="apparmor"
@@ -1127,6 +1138,7 @@ CONFIG_DEFXX=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_RBU=m
 CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
 CONFIG_DEPCA=m
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_DETECT_HUNG_TASK=y
@@ -1145,8 +1157,11 @@ CONFIG_DLM=m
 # CONFIG_DLM_DEBUG is not set
 # CONFIG_DM9000 is not set
 CONFIG_DM9102=m
+CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
-# CONFIG_DMAR is not set
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_FLOPPY_WA=y
 # CONFIG_DMATEST is not set
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_ENGINE=y
@@ -1180,7 +1195,6 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
 CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_TDFX=m
@@ -1193,6 +1207,7 @@ CONFIG_DSCC4_PCISYNC=y
 CONFIG_DSCC4_PCI_RST=y
 # CONFIG_DT3155_CCIR is not set
 CONFIG_DTC=y
+CONFIG_DTL=y
 CONFIG_DTLK=m
 CONFIG_DUMMY=m
 CONFIG_DUMMY_CONSOLE=y
@@ -1210,6 +1225,7 @@ CONFIG_DVB_BT8XX=m
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_AV=m
 CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_CAPTURE_DRIVERS=y
 CONFIG_DVB_CORE=m
@@ -1348,7 +1364,6 @@ CONFIG_EDAC_AMD64=m
 CONFIG_EDAC_AMD76X=m
 # CONFIG_EDAC_AMD8111 is not set
 # CONFIG_EDAC_AMD8131 is not set
-# CONFIG_EDAC_CPC925 is not set
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_E752X=m
@@ -1366,7 +1381,6 @@ CONFIG_EDAC_I82975X=m
 CONFIG_EDAC_MCE=y
 CONFIG_EDAC_MCE_INJ=m
 CONFIG_EDAC_MM_EDAC=m
-# CONFIG_EDAC_PASEMI is not set
 CONFIG_EDAC_R82600=m
 CONFIG_EDAC_X38=m
 CONFIG_EDD=y
@@ -1385,6 +1399,7 @@ CONFIG_EFI=y
 CONFIG_EFI_PARTITION=y
 CONFIG_EFI_VARS=y
 CONFIG_EFS_FS=m
+CONFIG_EHEA=m
 CONFIG_EISA=y
 CONFIG_EISA_NAMES=y
 CONFIG_EISA_PCI_EISA=y
@@ -1394,7 +1409,7 @@ CONFIG_EL1=m
 CONFIG_EL16=m
 CONFIG_EL2=m
 CONFIG_EL3=m
-# CONFIG_ELECTRA_CF is not set
+CONFIG_ELECTRA_CF=m
 CONFIG_ELF_CORE=y
 CONFIG_ELMC=m
 CONFIG_ELMC_II=m
@@ -1404,6 +1419,7 @@ CONFIG_ELPLUS=m
 # CONFIG_ENABLE_MUST_CHECK is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENC28J60 is not set
+CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_ENCRYPTED_KEYS=m
 CONFIG_ENIC=m
 CONFIG_EPIC100=m
@@ -1537,9 +1553,9 @@ CONFIG_FB_TMIO=m
 CONFIG_FB_TMIO_ACCELL=y
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_VALKYRIE=y
+CONFIG_FB_VESA=m
 CONFIG_FB_VIA=m
 # CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_VT8623=m
 # CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_XGI=m
@@ -1577,7 +1593,6 @@ CONFIG_FORCEDETH=m
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_WARN=1024
@@ -1714,6 +1729,7 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_GENERIC_HARDIRQS=y
 CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_IDE=y
+CONFIG_HAVE_INTEL_TXT=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -1761,11 +1777,12 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y
 # CONFIG_HERMES_PRISM is not set
 CONFIG_HFSPLUS_FS=m
 CONFIG_HFS_FS=m
-# CONFIG_HIBERNATION is not set
+CONFIG_HIBERNATION=y
 CONFIG_HID=m
 CONFIG_HIDRAW=y
 CONFIG_HID_3M_PCT=m
 CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=m
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
@@ -1879,12 +1896,12 @@ CONFIG_HOTPLUG_PCI_ACPI=m
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_COMPAQ=m
 CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
-CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_HOTPLUG_PCI_IBM=m
 CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_HOTPLUG_PCI_RPA=y
+CONFIG_HOTPLUG_PCI_RPA_DLPAR=y
 CONFIG_HOTPLUG_PCI_SHPC=m
 CONFIG_HP100=m
 CONFIG_HPET=y
@@ -1901,7 +1918,7 @@ CONFIG_HTC_PASIC3=m
 CONFIG_HT_IRQ=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y
-# CONFIG_HVC_CONSOLE is not set
+CONFIG_HVCS=m
 CONFIG_HVC_DCC=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
@@ -1961,7 +1978,6 @@ CONFIG_I2C_OCORES=m
 CONFIG_I2C_OMAP=y
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_PASEMI is not set
 CONFIG_I2C_PCA_ISA=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PIIX4=m
@@ -2001,17 +2017,14 @@ CONFIG_I8K=m
 CONFIG_IA32_EMULATION=y
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
-# CONFIG_IBMEBUS is not set
 CONFIG_IBMLANA=m
 CONFIG_IBMLS=m
 # CONFIG_IBMMCA_SCSI_DEV_RESET is not set
 CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y
 CONFIG_IBMOL=m
 CONFIG_IBMTR=m
-# CONFIG_IBMVETH is not set
 CONFIG_IBMVIO=y
 CONFIG_IBM_ASM=m
-# CONFIG_IBM_BSR is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
@@ -2074,6 +2087,7 @@ CONFIG_INFINIBAND_AMSO1100_DEBUG=y
 CONFIG_INFINIBAND_CXGB3=m
 # CONFIG_INFINIBAND_CXGB3_DEBUG is not set
 CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EHCA=m
 CONFIG_INFINIBAND_IPATH=m
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
@@ -2174,6 +2188,7 @@ CONFIG_INTEL_IOATDMA=m
 CONFIG_INTEL_IPS=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_INTEL_MID_DMAC=m
+CONFIG_IOMMU_API=y
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IOSCHED_CFQ=y
@@ -2205,6 +2220,7 @@ CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IPC_NS=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_DECAP=y
 CONFIG_IPDDP_ENCAP=y
@@ -2218,6 +2234,7 @@ CONFIG_IPPP_FILTER=y
 CONFIG_IPV6=y
 # CONFIG_IPV6_MIP6 is not set
 # CONFIG_IPV6_MROUTE is not set
+CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_IPV6_PRIVACY=y
@@ -2235,6 +2252,7 @@ CONFIG_IPW2200_MONITOR=y
 CONFIG_IPW2200_PROMISCUOUS=y
 CONFIG_IPW2200_QOS=y
 CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPWIRELESS=m
 CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -2309,7 +2327,6 @@ CONFIG_IRDA_ULTRA=y
 CONFIG_IRLAN=m
 CONFIG_IRNET=m
 # CONFIG_IRQSOFF_TRACER is not set
-# CONFIG_IRQ_ALL_CPUS is not set
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_IRQ_WORK=y
 CONFIG_IRTTY_SIR=m
@@ -2380,6 +2397,7 @@ CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 CONFIG_ITCO_WDT=m
+CONFIG_IWL4965=y
 CONFIG_IWL5000=y
 CONFIG_IWLAGN=m
 CONFIG_IWLWIFI=m
@@ -2464,6 +2482,7 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_XZ is not set
 CONFIG_KEXEC=y
+CONFIG_KEXEC_JUMP=y
 CONFIG_KEYBOARD_ADP5520=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ATKBD=y
@@ -2506,7 +2525,7 @@ CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_KVM_BOOK3S_32=m
 CONFIG_KVM_BOOK3S_32_HANDLER=y
-# CONFIG_KVM_BOOK3S_64 is not set
+CONFIG_KVM_BOOK3S_64_HANDLER=y
 CONFIG_KVM_BOOK3S_HANDLER=y
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
@@ -2624,7 +2643,6 @@ CONFIG_LOGIWII_FF=y
 # CONFIG_LOGO is not set
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LP486E=m
-# CONFIG_LPARCFG is not set
 CONFIG_LPC_SCH=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_LRU_CACHE=m
@@ -2693,7 +2711,6 @@ CONFIG_MAX1363_RING_BUFFER=y
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MAX8925_POWER=m
 # CONFIG_MAXSMP is not set
-CONFIG_MAX_RAW_DEVS=256
 CONFIG_MCA=y
 CONFIG_MCA_LEGACY=y
 # CONFIG_MCA_PROC_FS is not set
@@ -3038,6 +3055,7 @@ CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_IPVS=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
@@ -3045,10 +3063,12 @@ CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -3072,6 +3092,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 CONFIG_NETFILTER_XT_TARGET_SECMARK=m
 CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
@@ -3223,6 +3244,7 @@ CONFIG_NF_NAT_TFTP=m
 CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_NILFS2_FS=m
+CONFIG_NIU=m
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLATTR=y
 CONFIG_NLS=y
@@ -3268,6 +3290,8 @@ CONFIG_NLS_UTF8=m
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NOHIGHMEM is not set
 CONFIG_NOP_TRACER=y
+CONFIG_NORTEL_HERMES=m
+CONFIG_NOZOMI=m
 CONFIG_NO_BOOTMEM=y
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
@@ -3407,12 +3431,22 @@ CONFIG_PARPORT_SERIAL=m
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PASEMI_MAC is not set
 CONFIG_PATA_ACPI=y
+CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
 CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
 CONFIG_PATA_CS5535=m
 CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
 CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
 # CONFIG_PATA_HPT3X3_DMA is not set
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT8213=m
@@ -3424,14 +3458,19 @@ CONFIG_PATA_MARVELL=m
 CONFIG_PATA_MPIIX=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
 CONFIG_PATA_OF_PLATFORM=m
 CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_PCMCIA=m
 CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_PLATFORM=m
 CONFIG_PATA_QDI=m
+CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RDC=m
 CONFIG_PATA_RZ1000=m
+CONFIG_PATA_SC1200=m
 CONFIG_PATA_SCH=m
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_SIL680=m
@@ -3516,9 +3555,11 @@ CONFIG_PHONE_IXJ=m
 CONFIG_PHONE_IXJ_PCMCIA=m
 CONFIG_PHYLIB=y
 # CONFIG_PHYP_DUMP is not set
+CONFIG_PID_NS=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_PLAT_VERSATILE=y
 CONFIG_PLIP=m
+CONFIG_PLX_HERMES=m
 CONFIG_PM=y
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_BACKLIGHT=y
@@ -3534,6 +3575,7 @@ CONFIG_PM_OPS=y
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
@@ -3551,13 +3593,10 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_POWER3=y
 CONFIG_POWER4=y
 # CONFIG_POWER4_ONLY is not set
-CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PPC=y
 CONFIG_PPC32=y
 # CONFIG_PPC601_SYNC_FIX is not set
-CONFIG_PPC_4K_PAGES=y
-# CONFIG_PPC_64K_PAGES is not set
 # CONFIG_PPC_82xx is not set
 # CONFIG_PPC_83xx is not set
 # CONFIG_PPC_85xx is not set
@@ -3605,11 +3644,10 @@ CONFIG_PPC_PS3=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_RTAS=y
 CONFIG_PPC_RTAS_DAEMON=y
-# CONFIG_PPC_SMLPAR is not set
-# CONFIG_PPC_SPLPAR is not set
 CONFIG_PPC_STD_MMU=y
 CONFIG_PPC_STD_MMU_32=y
 CONFIG_PPC_STD_MMU_64=y
+CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_PPC_UDBG_16550=y
 CONFIG_PPDEV=m
 CONFIG_PPPOATM=m
@@ -3627,7 +3665,6 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_PARPORT=m
 # CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
 CONFIG_PPTP=m
 # CONFIG_PQ2ADS is not set
 # CONFIG_PREEMPT is not set
@@ -3648,6 +3685,7 @@ CONFIG_PROC_KCORE=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_VMCORE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_PROFILING=y
@@ -3666,7 +3704,6 @@ CONFIG_PS3_STORAGE=m
 CONFIG_PS3_SYS_MANAGER=y
 CONFIG_PS3_VRAM=m
 CONFIG_PS3_VUART=y
-CONFIG_PSERIES_ENERGY=m
 CONFIG_PSERIES_MSI=y
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
@@ -3729,6 +3766,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_RD_XZ=y
+CONFIG_REALTEK_PHY=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_REGULATOR=y
@@ -3771,6 +3809,8 @@ CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_REISERFS_FS_XATTR=y
 # CONFIG_REISERFS_PROC_INFO is not set
 CONFIG_RELAY=y
+CONFIG_RELOCATABLE=y
+CONFIG_RESOURCE_COUNTERS=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_LEDS=y
@@ -3812,7 +3852,6 @@ CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT61PCI=m
 CONFIG_RT73USB=m
 CONFIG_RTAS_ERROR_LOGGING=y
-# CONFIG_RTAS_FLASH is not set
 CONFIG_RTAS_PROC=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
@@ -3868,14 +3907,17 @@ CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
+CONFIG_RTL8180=m
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192U=m
 CONFIG_RTLWIFI=m
+# CONFIG_RTS_PSTOR_DEBUG is not set
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
@@ -3912,7 +3954,6 @@ CONFIG_SC1200_WDT=m
 CONFIG_SC520_WDT=m
 CONFIG_SC92031=m
 CONFIG_SCA3000=m
-# CONFIG_SCANLOG is not set
 CONFIG_SCC=m
 # CONFIG_SCC_DELAY is not set
 # CONFIG_SCC_TRXECHO is not set
@@ -3922,6 +3963,7 @@ CONFIG_SCHED_HRTICK=y
 CONFIG_SCHED_MC=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_SCHED_SMT=y
+CONFIG_SCHED_TRACER=y
 CONFIG_SCSI=y
 CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_3W_SAS=m
@@ -3970,15 +4012,11 @@ CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_IBMMCA=m
-# CONFIG_SCSI_IBMVFC is not set
-# CONFIG_SCSI_IBMVSCSI is not set
-# CONFIG_SCSI_IBMVSCSIS is not set
+CONFIG_SCSI_IBMVFC_TRACE=y
 CONFIG_SCSI_IMM=m
 CONFIG_SCSI_IN2000=m
 CONFIG_SCSI_INIA100=m
 CONFIG_SCSI_INITIO=m
-# CONFIG_SCSI_IPR_DUMP is not set
-# CONFIG_SCSI_IPR_TRACE is not set
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_ISCSI_ATTRS=m
 # CONFIG_SCSI_IZIP_EPP16 is not set
@@ -3997,6 +4035,7 @@ CONFIG_SCSI_MPT2SAS=m
 # CONFIG_SCSI_MPT2SAS_LOGGING is not set
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_MVSAS=m
 CONFIG_SCSI_MVSAS_DEBUG=y
 CONFIG_SCSI_NCR53C406A=m
 CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
@@ -4090,6 +4129,7 @@ CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
@@ -4185,6 +4225,7 @@ CONFIG_SENSORS_W83793=m
 CONFIG_SENSORS_W83795=m
 # CONFIG_SENSORS_W83795_FANCTRL is not set
 CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_WM831X=m
 CONFIG_SENSORS_WM8350=m
 CONFIG_SERIAL_8250_ACCENT=m
@@ -4417,6 +4458,7 @@ CONFIG_SND_OPTI92X_AD1848=m
 CONFIG_SND_OPTI92X_CS4231=m
 CONFIG_SND_OPTI93X=m
 CONFIG_SND_OSSEMUL=y
+CONFIG_SND_OXYGEN=m
 CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_PCI=y
 CONFIG_SND_PCMCIA=y
@@ -4532,6 +4574,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 CONFIG_SND_VIA82XX=m
 CONFIG_SND_VIA82XX_MODEM=m
 CONFIG_SND_VIRMIDI=m
+CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VMASTER=y
 CONFIG_SND_VX222=m
 CONFIG_SND_VXPOCKET=m
@@ -4619,7 +4662,6 @@ CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_PCIHOST=y
 CONFIG_SSB_PCIHOST_POSSIBLE=y
-# CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
 CONFIG_SSB_POSSIBLE=y
 CONFIG_SSB_SDIOHOST=y
@@ -4709,6 +4751,7 @@ CONFIG_TCP_MD5SIG=y
 CONFIG_TEHUTI=m
 CONFIG_TEKRAM_DONGLE=m
 CONFIG_TELCLOCK=m
+CONFIG_TEST_KSTRTOX=m
 # CONFIG_TEST_LIST_SORT is not set
 CONFIG_TEST_POWER=m
 CONFIG_TEXTSEARCH=y
@@ -4746,6 +4789,7 @@ CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_ST=m
 CONFIG_TLAN=m
+CONFIG_TMD_HERMES=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMS380TR=m
@@ -4987,7 +5031,6 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB_HSO=m
 CONFIG_USB_HWA_HCD=m
 CONFIG_USB_IDMOUSE=m
-# CONFIG_USB_INVENTRA_DMA is not set
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_IPHETH=m
 # CONFIG_USB_IP_DEBUG_ENABLE is not set
@@ -5016,10 +5059,8 @@ CONFIG_USB_MR800=m
 # CONFIG_USB_MUSB_DEBUG is not set
 CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_USB_MUSB_HOST is not set
-# CONFIG_USB_MUSB_OMAP2PLUS is not set
 CONFIG_USB_MUSB_OTG=y
 # CONFIG_USB_MUSB_PERIPHERAL is not set
-CONFIG_USB_MUSB_TUSB6010=y
 CONFIG_USB_NET2280=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
@@ -5034,13 +5075,14 @@ CONFIG_USB_NET_MCS7830=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
-# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
 # CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -5130,6 +5172,7 @@ CONFIG_USB_SISUSBVGA=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
@@ -5150,7 +5193,6 @@ CONFIG_USB_TEST=m
 # CONFIG_USB_TI_CPPI_DMA is not set
 CONFIG_USB_TMC=m
 CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_TUSB_OMAP_DMA=y
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_UAS=m
 CONFIG_USB_UEAGLEATM=m
@@ -5173,10 +5215,12 @@ CONFIG_USB_ZD1201=m
 CONFIG_USB_ZERO=m
 # CONFIG_USB_ZERO_HNPTEST is not set
 CONFIG_USB_ZR364XX=m
+CONFIG_USER_NS=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_UTS_NS=y
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_I1480U=m
@@ -5192,7 +5236,6 @@ CONFIG_VFP=y
 CONFIG_VFPv3=y
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
 CONFIG_VGA_ARB=y
-CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_VHOST_NET=m
 CONFIG_VIA_FIR=m
@@ -5237,6 +5280,7 @@ CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_DM6446_CCDC=m
 CONFIG_VIDEO_DT3155=m
 CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_FB_IVTV=m
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -5331,7 +5375,7 @@ CONFIG_VMWARE_PVSCSI=m
 CONFIG_VMXNET3=m
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VORTEX=m
-# CONFIG_VSX is not set
+CONFIG_VSX=y
 CONFIG_VT=y
 # CONFIG_VT6655 is not set
 CONFIG_VT_CONSOLE=y