3,4c3,4
< # Linux kernel version: 2.6.31-mainline1
< # Mon Jun 21 13:24:13 2010
---
> # Linux kernel version: 2.6.31-02063113-generic
> # Fri Jun  4 18:00:12 2010
92,93c92,93
< # CONFIG_CLASSIC_RCU is not set
< CONFIG_TREE_RCU=y
---
> CONFIG_CLASSIC_RCU=y
> # CONFIG_TREE_RCU is not set
95,97d94
< # CONFIG_RCU_TRACE is not set
< CONFIG_RCU_FANOUT=64
< # CONFIG_RCU_FANOUT_EXACT is not set
103c100,104
< # CONFIG_GROUP_SCHED is not set
---
> CONFIG_GROUP_SCHED=y
> CONFIG_FAIR_GROUP_SCHED=y
> CONFIG_RT_GROUP_SCHED=y
> # CONFIG_USER_SCHED is not set
> CONFIG_CGROUP_SCHED=y
121c122
< CONFIG_USER_NS=y
---
> # CONFIG_USER_NS is not set
170c171
< # CONFIG_OPROFILE_IBS is not set
---
> CONFIG_OPROFILE_IBS=y
199c200
< CONFIG_BLK_DEV_BSG=y
---
> # CONFIG_BLK_DEV_BSG is not set
267,268c268,269
< CONFIG_MCORE2=y
< # CONFIG_GENERIC_CPU is not set
---
> # CONFIG_MCORE2 is not set
> CONFIG_GENERIC_CPU=y
275,277d275
< CONFIG_X86_INTEL_USERCOPY=y
< CONFIG_X86_USE_PPRO_CHECKSUM=y
< CONFIG_X86_P6_NOP=y
303,304c301,302
< # CONFIG_PREEMPT_VOLUNTARY is not set
< CONFIG_PREEMPT=y
---
> CONFIG_PREEMPT_VOLUNTARY=y
> # CONFIG_PREEMPT is not set
322c320
< # CONFIG_X86_CPU_DEBUG is not set
---
> CONFIG_X86_CPU_DEBUG=m
371c369
< # CONFIG_HZ_100 is not set
---
> CONFIG_HZ_100=y
374,375c372,373
< CONFIG_HZ_1000=y
< CONFIG_HZ=1000
---
> # CONFIG_HZ_1000 is not set
> CONFIG_HZ=100
544c542
< # CONFIG_PACKET_MMAP is not set
---
> CONFIG_PACKET_MMAP=y
1057,1060c1055,1058
< CONFIG_BT=m
< CONFIG_BT_L2CAP=m
< CONFIG_BT_SCO=m
< CONFIG_BT_RFCOMM=m
---
> CONFIG_BT=y
> CONFIG_BT_L2CAP=y
> CONFIG_BT_SCO=y
> CONFIG_BT_RFCOMM=y
1096a1095,1097
> CONFIG_LIB80211_CRYPT_WEP=m
> CONFIG_LIB80211_CRYPT_CCMP=m
> CONFIG_LIB80211_CRYPT_TKIP=m
1510,1511c1511,1512
< CONFIG_SATA_AHCI=m
< CONFIG_SATA_SIL24=m
---
> CONFIG_SATA_AHCI=y
> CONFIG_SATA_SIL24=y
1513c1514
< CONFIG_SATA_SVW=m
---
> CONFIG_SATA_SVW=y
1516c1517
< CONFIG_SATA_NV=m
---
> CONFIG_SATA_NV=y
1518,1523c1519,1524
< CONFIG_SATA_QSTOR=m
< CONFIG_SATA_PROMISE=m
< CONFIG_SATA_SX4=m
< CONFIG_SATA_SIL=m
< CONFIG_SATA_SIS=m
< CONFIG_SATA_ULI=m
---
> CONFIG_SATA_QSTOR=y
> CONFIG_SATA_PROMISE=y
> CONFIG_SATA_SX4=y
> CONFIG_SATA_SIL=y
> CONFIG_SATA_SIS=y
> CONFIG_SATA_ULI=y
1525,1526c1526,1527
< CONFIG_SATA_VITESSE=m
< CONFIG_SATA_INIC162X=m
---
> CONFIG_SATA_VITESSE=y
> CONFIG_SATA_INIC162X=y
1528,1531c1529,1532
< CONFIG_PATA_ALI=m
< CONFIG_PATA_AMD=m
< CONFIG_PATA_ARTOP=m
< CONFIG_PATA_ATIIXP=m
---
> CONFIG_PATA_ALI=y
> CONFIG_PATA_AMD=y
> CONFIG_PATA_ARTOP=y
> CONFIG_PATA_ATIIXP=y
1533,1535c1534,1536
< CONFIG_PATA_CMD64X=m
< CONFIG_PATA_CS5520=m
< CONFIG_PATA_CS5530=m
---
> CONFIG_PATA_CMD64X=y
> CONFIG_PATA_CS5520=y
> CONFIG_PATA_CS5530=y
1537c1538
< CONFIG_PATA_EFAR=m
---
> CONFIG_PATA_EFAR=y
1539,1540c1540,1541
< CONFIG_PATA_HPT366=m
< CONFIG_PATA_HPT37X=m
---
> CONFIG_PATA_HPT366=y
> CONFIG_PATA_HPT37X=y
1542c1543
< CONFIG_PATA_HPT3X3=m
---
> CONFIG_PATA_HPT3X3=y
1544c1545
< CONFIG_PATA_IT821X=m
---
> CONFIG_PATA_IT821X=y
1546,1551c1547,1552
< CONFIG_PATA_JMICRON=m
< CONFIG_PATA_TRIFLEX=m
< CONFIG_PATA_MARVELL=m
< CONFIG_PATA_MPIIX=m
< CONFIG_PATA_OLDPIIX=m
< CONFIG_PATA_NETCELL=m
---
> CONFIG_PATA_JMICRON=y
> CONFIG_PATA_TRIFLEX=y
> CONFIG_PATA_MARVELL=y
> CONFIG_PATA_MPIIX=y
> CONFIG_PATA_OLDPIIX=y
> CONFIG_PATA_NETCELL=y
1553,1554c1554,1555
< CONFIG_PATA_NS87410=m
< CONFIG_PATA_NS87415=m
---
> CONFIG_PATA_NS87410=y
> CONFIG_PATA_NS87415=y
1558c1559
< CONFIG_PATA_PDC_OLD=m
---
> CONFIG_PATA_PDC_OLD=y
1560,1564c1561,1565
< CONFIG_PATA_RZ1000=m
< CONFIG_PATA_SC1200=m
< CONFIG_PATA_SERVERWORKS=m
< CONFIG_PATA_PDC2027X=m
< CONFIG_PATA_SIL680=m
---
> CONFIG_PATA_RZ1000=y
> CONFIG_PATA_SC1200=y
> CONFIG_PATA_SERVERWORKS=y
> CONFIG_PATA_PDC2027X=y
> CONFIG_PATA_SIL680=y
1566,1568c1567,1569
< CONFIG_PATA_VIA=m
< CONFIG_PATA_WINBOND=m
< CONFIG_PATA_SCH=m
---
> CONFIG_PATA_VIA=y
> CONFIG_PATA_WINBOND=y
> CONFIG_PATA_SCH=y
1646c1647
< CONFIG_TUN=y
---
> CONFIG_TUN=m
1814,1815c1815,1930
< # CONFIG_WLAN_PRE80211 is not set
< # CONFIG_WLAN_80211 is not set
---
> CONFIG_WLAN_PRE80211=y
> CONFIG_STRIP=m
> CONFIG_PCMCIA_WAVELAN=m
> CONFIG_PCMCIA_NETWAVE=m
> CONFIG_WLAN_80211=y
> CONFIG_PCMCIA_RAYCS=m
> CONFIG_LIBERTAS=m
> CONFIG_LIBERTAS_USB=m
> CONFIG_LIBERTAS_CS=m
> CONFIG_LIBERTAS_SDIO=m
> CONFIG_LIBERTAS_SPI=m
> # CONFIG_LIBERTAS_DEBUG is not set
> CONFIG_LIBERTAS_THINFIRM=m
> CONFIG_LIBERTAS_THINFIRM_USB=m
> CONFIG_AIRO=m
> CONFIG_ATMEL=m
> CONFIG_PCI_ATMEL=m
> CONFIG_PCMCIA_ATMEL=m
> CONFIG_AT76C50X_USB=m
> CONFIG_AIRO_CS=m
> CONFIG_PCMCIA_WL3501=m
> CONFIG_PRISM54=m
> CONFIG_USB_ZD1201=m
> CONFIG_USB_NET_RNDIS_WLAN=m
> CONFIG_RTL8180=m
> CONFIG_RTL8187=m
> CONFIG_RTL8187_LEDS=y
> CONFIG_ADM8211=m
> CONFIG_MAC80211_HWSIM=m
> CONFIG_MWL8K=m
> CONFIG_P54_COMMON=m
> CONFIG_P54_USB=m
> CONFIG_P54_PCI=m
> CONFIG_P54_SPI=m
> CONFIG_P54_LEDS=y
> CONFIG_ATH_COMMON=m
> CONFIG_ATH5K=m
> # CONFIG_ATH5K_DEBUG is not set
> CONFIG_ATH9K=m
> CONFIG_ATH9K_DEBUG=y
> CONFIG_AR9170_USB=m
> CONFIG_AR9170_LEDS=y
> CONFIG_IPW2100=m
> CONFIG_IPW2100_MONITOR=y
> # CONFIG_IPW2100_DEBUG is not set
> CONFIG_IPW2200=m
> CONFIG_IPW2200_MONITOR=y
> CONFIG_IPW2200_RADIOTAP=y
> CONFIG_IPW2200_PROMISCUOUS=y
> CONFIG_IPW2200_QOS=y
> # CONFIG_IPW2200_DEBUG is not set
> CONFIG_LIBIPW=m
> CONFIG_LIBIPW_DEBUG=y
> CONFIG_IWLWIFI=m
> CONFIG_IWLWIFI_LEDS=y
> # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
> # CONFIG_IWLWIFI_DEBUG is not set
> CONFIG_IWLAGN=m
> CONFIG_IWL4965=y
> CONFIG_IWL5000=y
> CONFIG_IWL3945=m
> CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
> CONFIG_HOSTAP=m
> CONFIG_HOSTAP_FIRMWARE=y
> CONFIG_HOSTAP_FIRMWARE_NVRAM=y
> CONFIG_HOSTAP_PLX=m
> CONFIG_HOSTAP_PCI=m
> CONFIG_HOSTAP_CS=m
> CONFIG_B43=m
> CONFIG_B43_PCI_AUTOSELECT=y
> CONFIG_B43_PCICORE_AUTOSELECT=y
> # CONFIG_B43_PCMCIA is not set
> CONFIG_B43_LEDS=y
> CONFIG_B43_HWRNG=y
> # CONFIG_B43_DEBUG is not set
> CONFIG_B43LEGACY=m
> CONFIG_B43LEGACY_PCI_AUTOSELECT=y
> CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
> CONFIG_B43LEGACY_LEDS=y
> CONFIG_B43LEGACY_HWRNG=y
> CONFIG_B43LEGACY_DEBUG=y
> CONFIG_B43LEGACY_DMA=y
> CONFIG_B43LEGACY_PIO=y
> CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
> # CONFIG_B43LEGACY_DMA_MODE is not set
> # CONFIG_B43LEGACY_PIO_MODE is not set
> CONFIG_ZD1211RW=m
> # CONFIG_ZD1211RW_DEBUG is not set
> CONFIG_RT2X00=m
> CONFIG_RT2400PCI=m
> CONFIG_RT2500PCI=m
> CONFIG_RT61PCI=m
> CONFIG_RT2500USB=m
> CONFIG_RT73USB=m
> CONFIG_RT2800USB=m
> CONFIG_RT2X00_LIB_PCI=m
> CONFIG_RT2X00_LIB_USB=m
> CONFIG_RT2X00_LIB=m
> CONFIG_RT2X00_LIB_HT=y
> CONFIG_RT2X00_LIB_FIRMWARE=y
> CONFIG_RT2X00_LIB_CRYPTO=y
> CONFIG_RT2X00_LIB_RFKILL=y
> CONFIG_RT2X00_LIB_LEDS=y
> # CONFIG_RT2X00_LIB_DEBUGFS is not set
> # CONFIG_RT2X00_DEBUG is not set
> CONFIG_HERMES=m
> CONFIG_HERMES_CACHE_FW_ON_INIT=y
> CONFIG_PLX_HERMES=m
> CONFIG_TMD_HERMES=m
> CONFIG_NORTEL_HERMES=m
> CONFIG_PCI_HERMES=m
> CONFIG_PCMCIA_HERMES=m
> CONFIG_PCMCIA_SPECTRUM=m
> CONFIG_WL12XX=m
> CONFIG_IWM=m
> # CONFIG_IWM_DEBUG is not set
1938c2053
< # CONFIG_PPPOL2TP is not set
---
> CONFIG_PPPOL2TP=m
2197c2312
< # CONFIG_TOUCHSCREEN_W90X900 is not set
---
> CONFIG_TOUCHSCREEN_W90X900=m
2254,2255d2368
< # CONFIG_SX is not set
< # CONFIG_RIO is not set
2389c2502
< # CONFIG_I2C_VOODOO3 is not set
---
> CONFIG_I2C_VOODOO3=m
2478a2592
> CONFIG_WM8350_POWER=m
2500c2614
< # CONFIG_SENSORS_ADT7473 is not set
---
> CONFIG_SENSORS_ADT7473=m
2511,2512c2625,2626
< # CONFIG_SENSORS_FSCHER is not set
< # CONFIG_SENSORS_FSCPOS is not set
---
> CONFIG_SENSORS_FSCHER=m
> CONFIG_SENSORS_FSCPOS=m
2574a2689
> CONFIG_WM8350_WATCHDOG=m
2625c2740
< # CONFIG_SSB_B43_PCI_BRIDGE is not set
---
> CONFIG_SSB_B43_PCI_BRIDGE=y
2645c2760,2761
< # CONFIG_MFD_WM8350_I2C is not set
---
> CONFIG_MFD_WM8350=m
> CONFIG_MFD_WM8350_I2C=m
2649c2765
< # CONFIG_AB3100_CORE is not set
---
> CONFIG_AB3100_CORE=m
2658a2775
> CONFIG_REGULATOR_WM8350=m
2747c2864
< # CONFIG_VIDEO_VIVI is not set
---
> CONFIG_VIDEO_VIVI=m
3094c3211
< # CONFIG_FB_MATROX_MULTIHEAD is not set
---
> CONFIG_FB_MATROX_MULTIHEAD=y
3338a3456
> CONFIG_SND_SOC_WM8350=m
3358c3476
< # CONFIG_SOUND_SSCAPE is not set
---
> CONFIG_SOUND_SSCAPE=m
3378,3379c3496,3497
< CONFIG_HID=m
< CONFIG_HID_DEBUG=y
---
> CONFIG_HID=y
> # CONFIG_HID_DEBUG is not set
3583c3701
< # CONFIG_USB_BERRY_CHARGE is not set
---
> CONFIG_USB_BERRY_CHARGE=m
3597c3715
< # CONFIG_USB_VST is not set
---
> CONFIG_USB_VST=m
3671c3789
< # CONFIG_MMC_RICOH_MMC is not set
---
> CONFIG_MMC_RICOH_MMC=m
3705a3824
> CONFIG_LEDS_WM8350=m
3819a3939
> CONFIG_RTC_DRV_WM8350=m
3850c3970
< # CONFIG_UIO_SMX is not set
---
> CONFIG_UIO_SMX=m
3868,3870c3988,4000
< # CONFIG_SXG is not set
< # CONFIG_ME4000 is not set
< # CONFIG_MEILHAUS is not set
---
> CONFIG_SXG=m
> CONFIG_ME4000=m
> CONFIG_MEILHAUS=m
> CONFIG_ME0600=m
> CONFIG_ME0900=m
> CONFIG_ME1000=m
> CONFIG_ME1400=m
> CONFIG_ME1600=m
> CONFIG_ME4600=m
> CONFIG_ME6000=m
> CONFIG_ME8100=m
> CONFIG_ME8200=m
> CONFIG_MEDUMMY=m
3876a4007,4008
> CONFIG_W35UND=m
> CONFIG_PRISM2_USB=m
3878c4010,4016
< # CONFIG_POCH is not set
---
> CONFIG_USB_ATMEL=m
> CONFIG_POCH=m
> CONFIG_AGNX=m
> # CONFIG_OTUS is not set
> CONFIG_RT2860=m
> CONFIG_RT2870=m
> CONFIG_RT3070=m
3889,3890c4027,4028
< # CONFIG_ALTERA_PCIE_CHDMA is not set
< # CONFIG_RTL8187SE is not set
---
> CONFIG_ALTERA_PCIE_CHDMA=m
> CONFIG_RTL8187SE=m
3892c4030
< # CONFIG_INPUT_MIMIO is not set
---
> CONFIG_INPUT_MIMIO=m
3894c4032
< # CONFIG_EPL is not set
---
> CONFIG_EPL=m
3899,3900c4037,4045
< # CONFIG_ANDROID is not set
< # CONFIG_DST is not set
---
> CONFIG_ANDROID=y
> CONFIG_ANDROID_BINDER_IPC=y
> CONFIG_ANDROID_LOGGER=m
> # CONFIG_ANDROID_RAM_CONSOLE is not set
> CONFIG_ANDROID_TIMED_OUTPUT=y
> CONFIG_ANDROID_TIMED_GPIO=m
> # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
> CONFIG_DST=m
> # CONFIG_DST_DEBUG is not set
3904c4049,4050
< # CONFIG_B3DFG is not set
---
> # CONFIG_STLC45XX is not set
> CONFIG_B3DFG=m
3906,3907c4052,4053
< # CONFIG_PLAN9AUTH is not set
< # CONFIG_HECI is not set
---
> CONFIG_PLAN9AUTH=m
> CONFIG_HECI=m
3912,3913c4058,4059
< # CONFIG_USB_CPC is not set
< # CONFIG_RDC_17F3101X is not set
---
> CONFIG_USB_CPC=m
> CONFIG_RDC_17F3101X=m
4001c4147
< # CONFIG_OCFS2_FS_POSIX_ACL is not set
---
> CONFIG_OCFS2_FS_POSIX_ACL=y
4267d4412
< CONFIG_DEBUG_PREEMPT=y
4280c4425
< # CONFIG_DEBUG_INFO is not set
---
> CONFIG_DEBUG_INFO=y
4303d4447
< CONFIG_HAVE_FTRACE_NMI_ENTER=y
4312d4455
< CONFIG_FTRACE_NMI_ENTER=y
4319,4320c4462
< CONFIG_FUNCTION_TRACER=y
< CONFIG_FUNCTION_GRAPH_TRACER=y
---
> # CONFIG_FUNCTION_TRACER is not set
4322d4463
< # CONFIG_PREEMPT_TRACER is not set
4335,4337d4475
< CONFIG_DYNAMIC_FTRACE=y
< # CONFIG_FUNCTION_PROFILER is not set
< CONFIG_FTRACE_MCOUNT_RECORD=y
4339,4340c4477
< CONFIG_MMIOTRACE=y
< # CONFIG_MMIOTRACE_TEST is not set
---
> # CONFIG_MMIOTRACE is not set
4351a4489
> # CONFIG_KMEMCHECK is not set
4389c4527
< # CONFIG_SECURITY_FILE_CAPABILITIES is not set
---
> CONFIG_SECURITY_FILE_CAPABILITIES=y
4417c4555
< CONFIG_CRYPTO_BLKCIPHER=y
---
> CONFIG_CRYPTO_BLKCIPHER=m
4443c4581
< CONFIG_CRYPTO_CBC=y
---
> CONFIG_CRYPTO_CBC=m
4446c4584
< CONFIG_CRYPTO_ECB=y
---
> CONFIG_CRYPTO_ECB=m