Merge commit 'v2.6.27-rc8' into x86/setup

diff --combined arch/x86/configs/i386_defconfig
index a7ae438,104275e..8cc9eea
--- 1/arch/x86/configs/i386_defconfig
--- 2/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
@@@ -1,13 -1,13 +1,13 @@@
  #
  # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.26-rc1
- # Sun May  4 19:59:02 2008
+ # Linux kernel version: 2.6.27-rc4
+ # Mon Aug 25 15:04:00 2008
  #
  # CONFIG_64BIT is not set
  CONFIG_X86_32=y
  # CONFIG_X86_64 is not set
  CONFIG_X86=y
- CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig"
+ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
  # CONFIG_GENERIC_LOCKBREAK is not set
  CONFIG_GENERIC_TIME=y
  CONFIG_GENERIC_CMOS_UPDATE=y
@@@ -53,6 -53,7 +53,7 @@@ CONFIG_X86_HT=
  CONFIG_X86_BIOS_REBOOT=y
  CONFIG_X86_TRAMPOLINE=y
  CONFIG_KTIME_SCALAR=y
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
  #
  # General setup
@@@ -82,6 -83,7 +83,7 @@@ CONFIG_CGROUPS=
  CONFIG_CGROUP_NS=y
  # CONFIG_CGROUP_DEVICE is not set
  CONFIG_CPUSETS=y
+ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
  CONFIG_GROUP_SCHED=y
  CONFIG_FAIR_GROUP_SCHED=y
  # CONFIG_RT_GROUP_SCHED is not set
@@@ -105,7 -107,6 +107,6 @@@ CONFIG_SYSCTL=
  # CONFIG_EMBEDDED is not set
  CONFIG_UID16=y
  CONFIG_SYSCTL_SYSCALL=y
- CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_KALLSYMS=y
  CONFIG_KALLSYMS_ALL=y
  CONFIG_KALLSYMS_EXTRA_PASS=y
@@@ -113,6 -114,7 +114,7 @@@ CONFIG_HOTPLUG=
  CONFIG_PRINTK=y
  CONFIG_BUG=y
  CONFIG_ELF_CORE=y
+ CONFIG_PCSPKR_PLATFORM=y
  # CONFIG_COMPAT_BRK is not set
  CONFIG_BASE_FULL=y
  CONFIG_FUTEX=y
@@@ -132,27 -134,35 +134,35 @@@ CONFIG_MARKERS=
  # CONFIG_OPROFILE is not set
  CONFIG_HAVE_OPROFILE=y
  CONFIG_KPROBES=y
+ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
  CONFIG_KRETPROBES=y
+ CONFIG_HAVE_IOREMAP_PROT=y
  CONFIG_HAVE_KPROBES=y
  CONFIG_HAVE_KRETPROBES=y
+ # CONFIG_HAVE_ARCH_TRACEHOOK is not set
  # CONFIG_HAVE_DMA_ATTRS is not set
+ CONFIG_USE_GENERIC_SMP_HELPERS=y
+ # CONFIG_HAVE_CLK is not set
  CONFIG_PROC_PAGE_MONITOR=y
+ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
  CONFIG_MODULES=y
+ # CONFIG_MODULE_FORCE_LOAD is not set
  CONFIG_MODULE_UNLOAD=y
  CONFIG_MODULE_FORCE_UNLOAD=y
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
- # CONFIG_KMOD is not set
+ CONFIG_KMOD=y
  CONFIG_STOP_MACHINE=y
  CONFIG_BLOCK=y
  # CONFIG_LBD is not set
  CONFIG_BLK_DEV_IO_TRACE=y
  # CONFIG_LSF is not set
  CONFIG_BLK_DEV_BSG=y
+ # CONFIG_BLK_DEV_INTEGRITY is not set
  
  #
  # IO Schedulers
@@@ -176,19 -186,17 +186,17 @@@ CONFIG_NO_HZ=
  CONFIG_HIGH_RES_TIMERS=y
  CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  CONFIG_SMP=y
+ CONFIG_X86_FIND_SMP_CONFIG=y
+ CONFIG_X86_MPPARSE=y
  CONFIG_X86_PC=y
  # CONFIG_X86_ELAN is not set
  # CONFIG_X86_VOYAGER is not set
- # CONFIG_X86_NUMAQ is not set
- # CONFIG_X86_SUMMIT is not set
- # CONFIG_X86_BIGSMP is not set
- # CONFIG_X86_VISWS is not set
  # CONFIG_X86_GENERICARCH is not set
- # CONFIG_X86_ES7000 is not set
- # CONFIG_X86_RDC321X is not set
  # CONFIG_X86_VSMP is not set
+ # CONFIG_X86_RDC321X is not set
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
  # CONFIG_PARAVIRT_GUEST is not set
+ # CONFIG_MEMTEST is not set
  # CONFIG_M386 is not set
  # CONFIG_M486 is not set
  # CONFIG_M586 is not set
@@@ -215,21 -223,19 +223,19 @@@
  # CONFIG_MPSC is not set
  CONFIG_MCORE2=y
  # CONFIG_GENERIC_CPU is not set
- # CONFIG_X86_GENERIC is not set
+ CONFIG_X86_GENERIC=y
  CONFIG_X86_CPU=y
  CONFIG_X86_CMPXCHG=y
- CONFIG_X86_L1_CACHE_SHIFT=6
+ CONFIG_X86_L1_CACHE_SHIFT=7
  CONFIG_X86_XADD=y
  CONFIG_X86_WP_WORKS_OK=y
  CONFIG_X86_INVLPG=y
  CONFIG_X86_BSWAP=y
  CONFIG_X86_POPAD_OK=y
- CONFIG_X86_GOOD_APIC=y
  CONFIG_X86_INTEL_USERCOPY=y
  CONFIG_X86_USE_PPRO_CHECKSUM=y
- CONFIG_X86_P6_NOP=y
  CONFIG_X86_TSC=y
- CONFIG_X86_MINIMUM_CPU_FAMILY=6
+ CONFIG_X86_MINIMUM_CPU_FAMILY=4
  CONFIG_X86_DEBUGCTLMSR=y
  CONFIG_HPET_TIMER=y
  CONFIG_HPET_EMULATE_RTC=y
@@@ -247,7 -253,7 +253,7 @@@ CONFIG_X86_IO_APIC=
  CONFIG_VM86=y
  # CONFIG_TOSHIBA is not set
  # CONFIG_I8K is not set
- # CONFIG_X86_REBOOTFIXUPS is not set
+ CONFIG_X86_REBOOTFIXUPS=y
  # CONFIG_MICROCODE is not set
  CONFIG_X86_MSR=y
  CONFIG_X86_CPUID=y
@@@ -256,32 -262,28 +262,28 @@@ CONFIG_HIGHMEM4G=
  # CONFIG_HIGHMEM64G is not set
  CONFIG_PAGE_OFFSET=0xC0000000
  CONFIG_HIGHMEM=y
- CONFIG_NEED_NODE_MEMMAP_SIZE=y
  CONFIG_ARCH_FLATMEM_ENABLE=y
  CONFIG_ARCH_SPARSEMEM_ENABLE=y
  CONFIG_ARCH_SELECT_MEMORY_MODEL=y
  CONFIG_SELECT_MEMORY_MODEL=y
- # CONFIG_FLATMEM_MANUAL is not set
+ CONFIG_FLATMEM_MANUAL=y
  # CONFIG_DISCONTIGMEM_MANUAL is not set
- CONFIG_SPARSEMEM_MANUAL=y
- CONFIG_SPARSEMEM=y
- CONFIG_HAVE_MEMORY_PRESENT=y
+ # CONFIG_SPARSEMEM_MANUAL is not set
+ CONFIG_FLATMEM=y
+ CONFIG_FLAT_NODE_MEM_MAP=y
  CONFIG_SPARSEMEM_STATIC=y
  # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
- 
- #
- # Memory hotplug is currently incompatible with Software Suspend
- #
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_RESOURCES_64BIT=y
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
- # CONFIG_HIGHPTE is not set
+ CONFIG_HIGHPTE=y
  # CONFIG_MATH_EMULATION is not set
  CONFIG_MTRR=y
- # CONFIG_X86_PAT is not set
+ # CONFIG_MTRR_SANITIZER is not set
+ CONFIG_X86_PAT=y
  CONFIG_EFI=y
  # CONFIG_IRQBALANCE is not set
  CONFIG_SECCOMP=y
@@@ -293,6 -295,7 +295,7 @@@ CONFIG_HZ=100
  CONFIG_SCHED_HRTICK=y
  CONFIG_KEXEC=y
  CONFIG_CRASH_DUMP=y
+ # CONFIG_KEXEC_JUMP is not set
  CONFIG_PHYSICAL_START=0x1000000
  CONFIG_RELOCATABLE=y
  CONFIG_PHYSICAL_ALIGN=0x200000
@@@ -312,6 -315,7 +315,7 @@@ CONFIG_PM_TRACE_RTC=
  CONFIG_PM_SLEEP_SMP=y
  CONFIG_PM_SLEEP=y
  CONFIG_SUSPEND=y
+ # CONFIG_PM_TEST_SUSPEND is not set
  CONFIG_SUSPEND_FREEZER=y
  CONFIG_HIBERNATION=y
  CONFIG_PM_STD_PARTITION=""
@@@ -337,6 -341,7 +341,7 @@@ CONFIG_ACPI_THERMAL=
  CONFIG_ACPI_BLACKLIST_YEAR=0
  # CONFIG_ACPI_DEBUG is not set
  CONFIG_ACPI_EC=y
+ # CONFIG_ACPI_PCI_SLOT is not set
  CONFIG_ACPI_POWER=y
  CONFIG_ACPI_SYSTEM=y
  CONFIG_X86_PM_TIMER=y
@@@ -395,8 -400,8 +400,8 @@@ CONFIG_PCI=
  # CONFIG_PCI_GOBIOS is not set
  # CONFIG_PCI_GOMMCONFIG is not set
  # CONFIG_PCI_GODIRECT is not set
- CONFIG_PCI_GOANY=y
  # CONFIG_PCI_GOOLPC is not set
+ CONFIG_PCI_GOANY=y
  CONFIG_PCI_BIOS=y
  CONFIG_PCI_DIRECT=y
  CONFIG_PCI_MMCONFIG=y
@@@ -448,10 -453,6 +453,6 @@@ CONFIG_HOTPLUG_PCI=
  CONFIG_BINFMT_ELF=y
  # CONFIG_BINFMT_AOUT is not set
  CONFIG_BINFMT_MISC=y
- 
- #
- # Networking
- #
  CONFIG_NET=y
  
  #
@@@ -475,7 -476,10 +476,10 @@@ CONFIG_IP_FIB_HASH=
  CONFIG_IP_MULTIPLE_TABLES=y
  CONFIG_IP_ROUTE_MULTIPATH=y
  CONFIG_IP_ROUTE_VERBOSE=y
- # CONFIG_IP_PNP is not set
+ CONFIG_IP_PNP=y
+ CONFIG_IP_PNP_DHCP=y
+ CONFIG_IP_PNP_BOOTP=y
+ CONFIG_IP_PNP_RARP=y
  # CONFIG_NET_IPIP is not set
  # CONFIG_NET_IPGRE is not set
  CONFIG_IP_MROUTE=y
@@@ -618,7 -622,6 +622,6 @@@ CONFIG_NET_SCHED=
  # CONFIG_NET_SCH_HTB is not set
  # CONFIG_NET_SCH_HFSC is not set
  # CONFIG_NET_SCH_PRIO is not set
- # CONFIG_NET_SCH_RR is not set
  # CONFIG_NET_SCH_RED is not set
  # CONFIG_NET_SCH_SFQ is not set
  # CONFIG_NET_SCH_TEQL is not set
@@@ -680,28 -683,19 +683,19 @@@ CONFIG_FIB_RULES=
  CONFIG_CFG80211=y
  CONFIG_NL80211=y
  CONFIG_WIRELESS_EXT=y
+ CONFIG_WIRELESS_EXT_SYSFS=y
  CONFIG_MAC80211=y
  
  #
  # Rate control algorithm selection
  #
+ CONFIG_MAC80211_RC_PID=y
  CONFIG_MAC80211_RC_DEFAULT_PID=y
- # CONFIG_MAC80211_RC_DEFAULT_NONE is not set
- 
- #
- # Selecting 'y' for an algorithm will
- #
- 
- #
- # build the algorithm into mac80211.
- #
  CONFIG_MAC80211_RC_DEFAULT="pid"
- CONFIG_MAC80211_RC_PID=y
  # CONFIG_MAC80211_MESH is not set
  CONFIG_MAC80211_LEDS=y
  # CONFIG_MAC80211_DEBUGFS is not set
- # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
- # CONFIG_MAC80211_DEBUG is not set
+ # CONFIG_MAC80211_DEBUG_MENU is not set
  # CONFIG_IEEE80211 is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
@@@ -717,6 -711,8 +711,8 @@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=y
+ CONFIG_FIRMWARE_IN_KERNEL=y
+ CONFIG_EXTRA_FIRMWARE=""
  # CONFIG_DEBUG_DRIVER is not set
  CONFIG_DEBUG_DEVRES=y
  # CONFIG_SYS_HYPERVISOR is not set
@@@ -749,6 -745,7 +745,7 @@@ CONFIG_BLK_DEV_RAM_SIZE=1638
  # CONFIG_BLK_DEV_XIP is not set
  # CONFIG_CDROM_PKTCDVD is not set
  # CONFIG_ATA_OVER_ETH is not set
+ # CONFIG_BLK_DEV_HD is not set
  CONFIG_MISC_DEVICES=y
  # CONFIG_IBM_ASM is not set
  # CONFIG_PHANTOM is not set
@@@ -760,10 -757,12 +757,12 @@@
  # CONFIG_FUJITSU_LAPTOP is not set
  # CONFIG_TC1100_WMI is not set
  # CONFIG_MSI_LAPTOP is not set
+ # CONFIG_COMPAL_LAPTOP is not set
  # CONFIG_SONY_LAPTOP is not set
  # CONFIG_THINKPAD_ACPI is not set
  # CONFIG_INTEL_MENLOW is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+ # CONFIG_HP_ILO is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@@ -802,12 -801,13 +801,13 @@@ CONFIG_SCSI_WAIT_SCAN=
  #
  CONFIG_SCSI_SPI_ATTRS=y
  # CONFIG_SCSI_FC_ATTRS is not set
- # CONFIG_SCSI_ISCSI_ATTRS is not set
+ CONFIG_SCSI_ISCSI_ATTRS=y
  # CONFIG_SCSI_SAS_ATTRS is not set
  # CONFIG_SCSI_SAS_LIBSAS is not set
  # CONFIG_SCSI_SRP_ATTRS is not set
  # CONFIG_SCSI_LOWLEVEL is not set
  # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+ # CONFIG_SCSI_DH is not set
  CONFIG_ATA=y
  # CONFIG_ATA_NONSTANDARD is not set
  CONFIG_ATA_ACPI=y
@@@ -842,7 -842,7 +842,7 @@@ CONFIG_PATA_AMD=
  # CONFIG_PATA_CS5536 is not set
  # CONFIG_PATA_CYPRESS is not set
  # CONFIG_PATA_EFAR is not set
- # CONFIG_ATA_GENERIC is not set
+ CONFIG_ATA_GENERIC=y
  # CONFIG_PATA_HPT366 is not set
  # CONFIG_PATA_HPT37X is not set
  # CONFIG_PATA_HPT3X2N is not set
@@@ -852,7 -852,7 +852,7 @@@
  # CONFIG_PATA_JMICRON is not set
  # CONFIG_PATA_TRIFLEX is not set
  # CONFIG_PATA_MARVELL is not set
- # CONFIG_PATA_MPIIX is not set
+ CONFIG_PATA_MPIIX=y
  CONFIG_PATA_OLDPIIX=y
  # CONFIG_PATA_NETCELL is not set
  # CONFIG_PATA_NINJA32 is not set
@@@ -871,6 -871,7 +871,7 @@@
  # CONFIG_PATA_SIS is not set
  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set
+ CONFIG_PATA_SCH=y
  CONFIG_MD=y
  CONFIG_BLK_DEV_MD=y
  # CONFIG_MD_LINEAR is not set
@@@ -894,13 -895,16 +895,16 @@@ CONFIG_DM_ZERO=
  #
  # IEEE 1394 (FireWire) support
  #
+ 
+ #
+ # Enable only one of the two stacks, unless you know what you are doing
+ #
  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
  CONFIG_MACINTOSH_DRIVERS=y
  CONFIG_MAC_EMUMOUSEBTN=y
  CONFIG_NETDEVICES=y
- # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_IFB is not set
  # CONFIG_DUMMY is not set
  # CONFIG_BONDING is not set
@@@ -910,7 -914,23 +914,23 @@@
  # CONFIG_VETH is not set
  # CONFIG_NET_SB1000 is not set
  # CONFIG_ARCNET is not set
- # CONFIG_PHYLIB is not set
+ CONFIG_PHYLIB=y
+ 
+ #
+ # MII PHY device drivers
+ #
+ # CONFIG_MARVELL_PHY is not set
+ # CONFIG_DAVICOM_PHY is not set
+ # CONFIG_QSEMI_PHY is not set
+ # CONFIG_LXT_PHY is not set
+ # CONFIG_CICADA_PHY is not set
+ # CONFIG_VITESSE_PHY is not set
+ # CONFIG_SMSC_PHY is not set
+ # CONFIG_BROADCOM_PHY is not set
+ # CONFIG_ICPLUS_PHY is not set
+ # CONFIG_REALTEK_PHY is not set
+ # CONFIG_FIXED_PHY is not set
+ # CONFIG_MDIO_BITBANG is not set
  CONFIG_NET_ETHERNET=y
  CONFIG_MII=y
  # CONFIG_HAPPYMEAL is not set
@@@ -943,10 -963,10 +963,10 @@@ CONFIG_FORCEDETH=
  CONFIG_E100=y
  # CONFIG_FEALNX is not set
  # CONFIG_NATSEMI is not set
- # CONFIG_NE2K_PCI is not set
+ CONFIG_NE2K_PCI=y
  # CONFIG_8139CP is not set
  CONFIG_8139TOO=y
- CONFIG_8139TOO_PIO=y
+ # CONFIG_8139TOO_PIO is not set
  # CONFIG_8139TOO_TUNE_TWISTER is not set
  # CONFIG_8139TOO_8129 is not set
  # CONFIG_8139_OLD_RX_RESET is not set
@@@ -961,25 -981,24 +981,24 @@@ CONFIG_NETDEV_1000=
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  CONFIG_E1000=y
- # CONFIG_E1000_NAPI is not set
  # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
- # CONFIG_E1000E is not set
- # CONFIG_E1000E_ENABLED is not set
+ CONFIG_E1000E=y
  # CONFIG_IP1000 is not set
  # CONFIG_IGB is not set
  # CONFIG_NS83820 is not set
  # CONFIG_HAMACHI is not set
  # CONFIG_YELLOWFIN is not set
- # CONFIG_R8169 is not set
+ CONFIG_R8169=y
  # CONFIG_SIS190 is not set
  # CONFIG_SKGE is not set
  CONFIG_SKY2=y
  # CONFIG_SKY2_DEBUG is not set
  # CONFIG_VIA_VELOCITY is not set
  CONFIG_TIGON3=y
- # CONFIG_BNX2 is not set
+ CONFIG_BNX2=y
  # CONFIG_QLA3XXX is not set
  # CONFIG_ATL1 is not set
+ # CONFIG_ATL1E is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
  # CONFIG_CHELSIO_T3 is not set
@@@ -1019,13 -1038,14 +1038,14 @@@ CONFIG_WLAN_80211=
  # CONFIG_RTL8180 is not set
  # CONFIG_RTL8187 is not set
  # CONFIG_ADM8211 is not set
+ # CONFIG_MAC80211_HWSIM is not set
  # CONFIG_P54_COMMON is not set
  CONFIG_ATH5K=y
  # CONFIG_ATH5K_DEBUG is not set
- # CONFIG_IWLWIFI is not set
+ # CONFIG_ATH9K is not set
  # CONFIG_IWLCORE is not set
  # CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_IWL4965 is not set
+ # CONFIG_IWLAGN is not set
  # CONFIG_IWL3945 is not set
  # CONFIG_HOSTAP is not set
  # CONFIG_B43 is not set
@@@ -1105,6 -1125,7 +1125,7 @@@ CONFIG_MOUSE_PS2_TRACKPOINT=
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  # CONFIG_MOUSE_SERIAL is not set
  # CONFIG_MOUSE_APPLETOUCH is not set
+ # CONFIG_MOUSE_BCM5974 is not set
  # CONFIG_MOUSE_VSXXXAA is not set
  CONFIG_INPUT_JOYSTICK=y
  # CONFIG_JOYSTICK_ANALOG is not set
@@@ -1139,12 -1160,14 +1160,14 @@@ CONFIG_INPUT_TOUCHSCREEN=
  # CONFIG_TOUCHSCREEN_GUNZE is not set
  # CONFIG_TOUCHSCREEN_ELO is not set
  # CONFIG_TOUCHSCREEN_MTOUCH is not set
+ # CONFIG_TOUCHSCREEN_INEXIO is not set
  # CONFIG_TOUCHSCREEN_MK712 is not set
  # CONFIG_TOUCHSCREEN_PENMOUNT is not set
  # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
  # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
  # CONFIG_TOUCHSCREEN_UCB1400 is not set
  # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+ # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
  CONFIG_INPUT_MISC=y
  # CONFIG_INPUT_PCSPKR is not set
  # CONFIG_INPUT_APANEL is not set
@@@ -1173,6 -1196,7 +1196,7 @@@ CONFIG_SERIO_LIBPS2=
  # Character devices
  #
  CONFIG_VT=y
+ CONFIG_CONSOLE_TRANSLATIONS=y
  CONFIG_VT_CONSOLE=y
  CONFIG_HW_CONSOLE=y
  CONFIG_VT_HW_CONSOLE_BINDING=y
@@@ -1223,8 -1247,8 +1247,8 @@@ CONFIG_UNIX98_PTYS=
  # CONFIG_LEGACY_PTYS is not set
  # CONFIG_IPMI_HANDLER is not set
  CONFIG_HW_RANDOM=y
- # CONFIG_HW_RANDOM_INTEL is not set
- # CONFIG_HW_RANDOM_AMD is not set
+ CONFIG_HW_RANDOM_INTEL=y
+ CONFIG_HW_RANDOM_AMD=y
  CONFIG_HW_RANDOM_GEODE=y
  CONFIG_HW_RANDOM_VIA=y
  CONFIG_NVRAM=y
@@@ -1245,7 -1269,6 +1269,6 @@@
  # CONFIG_CS5535_GPIO is not set
  # CONFIG_RAW_DRIVER is not set
  CONFIG_HPET=y
- # CONFIG_HPET_RTC_IRQ is not set
  # CONFIG_HPET_MMAP is not set
  # CONFIG_HANGCHECK_TIMER is not set
  # CONFIG_TCG_TPM is not set
@@@ -1254,43 -1277,64 +1277,64 @@@ CONFIG_DEVPORT=
  CONFIG_I2C=y
  CONFIG_I2C_BOARDINFO=y
  # CONFIG_I2C_CHARDEV is not set
+ CONFIG_I2C_HELPER_AUTO=y
  
  #
  # I2C Hardware Bus support
  #
+ 
+ #
+ # PC SMBus host controller drivers
+ #
  # CONFIG_I2C_ALI1535 is not set
  # CONFIG_I2C_ALI1563 is not set
  # CONFIG_I2C_ALI15X3 is not set
  # CONFIG_I2C_AMD756 is not set
  # CONFIG_I2C_AMD8111 is not set
  CONFIG_I2C_I801=y
- # CONFIG_I2C_I810 is not set
+ # CONFIG_I2C_ISCH is not set
  # CONFIG_I2C_PIIX4 is not set
  # CONFIG_I2C_NFORCE2 is not set
- # CONFIG_I2C_OCORES is not set
- # CONFIG_I2C_PARPORT_LIGHT is not set
- # CONFIG_I2C_PROSAVAGE is not set
- # CONFIG_I2C_SAVAGE4 is not set
- # CONFIG_I2C_SIMTEC is not set
- # CONFIG_SCx200_ACB is not set
  # CONFIG_I2C_SIS5595 is not set
  # CONFIG_I2C_SIS630 is not set
  # CONFIG_I2C_SIS96X is not set
- # CONFIG_I2C_TAOS_EVM is not set
- # CONFIG_I2C_STUB is not set
- # CONFIG_I2C_TINY_USB is not set
  # CONFIG_I2C_VIA is not set
  # CONFIG_I2C_VIAPRO is not set
+ 
+ #
+ # I2C system bus drivers (mostly embedded / system-on-chip)
+ #
+ # CONFIG_I2C_OCORES is not set
+ # CONFIG_I2C_SIMTEC is not set
+ 
+ #
+ # External I2C/SMBus adapter drivers
+ #
+ # CONFIG_I2C_PARPORT_LIGHT is not set
+ # CONFIG_I2C_TAOS_EVM is not set
+ # CONFIG_I2C_TINY_USB is not set
+ 
+ #
+ # Graphics adapter I2C/DDC channel drivers
+ #
  # CONFIG_I2C_VOODOO3 is not set
+ 
+ #
+ # Other I2C/SMBus bus drivers
+ #
  # CONFIG_I2C_PCA_PLATFORM is not set
+ # CONFIG_I2C_STUB is not set
+ # CONFIG_SCx200_ACB is not set
  
  #
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
+ # CONFIG_AT24 is not set
  # CONFIG_SENSORS_EEPROM is not set
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
+ # CONFIG_SENSORS_PCA9539 is not set
  # CONFIG_SENSORS_PCF8591 is not set
  # CONFIG_SENSORS_MAX6875 is not set
  # CONFIG_SENSORS_TSL2550 is not set
@@@ -1299,6 -1343,8 +1343,8 @@@
  # CONFIG_I2C_DEBUG_BUS is not set
  # CONFIG_I2C_DEBUG_CHIP is not set
  # CONFIG_SPI is not set
+ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+ # CONFIG_GPIOLIB is not set
  # CONFIG_W1 is not set
  CONFIG_POWER_SUPPLY=y
  # CONFIG_POWER_SUPPLY_DEBUG is not set
@@@ -1360,8 -1406,10 +1406,10 @@@ CONFIG_SSB_POSSIBLE=
  #
  # Multifunction device drivers
  #
+ # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+ # CONFIG_MFD_TMIO is not set
  
  #
  # Multimedia devices
@@@ -1372,6 -1420,7 +1420,7 @@@
  #
  # CONFIG_VIDEO_DEV is not set
  # CONFIG_DVB_CORE is not set
+ # CONFIG_VIDEO_MEDIA is not set
  
  #
  # Multimedia drivers
@@@ -1418,7 -1467,6 +1467,6 @@@ CONFIG_FB_CFB_IMAGEBLIT=
  # CONFIG_FB_SYS_IMAGEBLIT is not set
  # CONFIG_FB_FOREIGN_ENDIAN is not set
  # CONFIG_FB_SYS_FOPS is not set
- CONFIG_FB_DEFERRED_IO=y
  # CONFIG_FB_SVGALIB is not set
  # CONFIG_FB_MACMODES is not set
  # CONFIG_FB_BACKLIGHT is not set
@@@ -1463,6 -1511,7 +1511,7 @@@ CONFIG_FB_EFI=
  # CONFIG_FB_TRIDENT is not set
  # CONFIG_FB_ARK is not set
  # CONFIG_FB_PM3 is not set
+ # CONFIG_FB_CARMINE is not set
  # CONFIG_FB_GEODE is not set
  # CONFIG_FB_VIRTUAL is not set
  CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@@ -1470,6 -1519,7 +1519,7 @@@
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
  # CONFIG_BACKLIGHT_CORGI is not set
  # CONFIG_BACKLIGHT_PROGEAR is not set
+ # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
  
  #
  # Display device support
@@@ -1482,21 -1532,14 +1532,13 @@@
  CONFIG_VGA_CONSOLE=y
  CONFIG_VGACON_SOFT_SCROLLBACK=y
  CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 -CONFIG_VIDEO_SELECT=y
  CONFIG_DUMMY_CONSOLE=y
  # CONFIG_FRAMEBUFFER_CONSOLE is not set
  CONFIG_LOGO=y
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
  CONFIG_LOGO_LINUX_CLUT224=y
- 
- #
- # Sound
- #
  CONFIG_SOUND=y
- 
- #
- # Advanced Linux Sound Architecture
- #
  CONFIG_SND=y
  CONFIG_SND_TIMER=y
  CONFIG_SND_PCM=y
@@@ -1514,20 -1557,14 +1556,14 @@@ CONFIG_SND_VERBOSE_PROCFS=
  # CONFIG_SND_VERBOSE_PRINTK is not set
  # CONFIG_SND_DEBUG is not set
  CONFIG_SND_VMASTER=y
- 
- #
- # Generic devices
- #
+ CONFIG_SND_DRIVERS=y
  # CONFIG_SND_PCSP is not set
  # CONFIG_SND_DUMMY is not set
  # CONFIG_SND_VIRMIDI is not set
  # CONFIG_SND_MTPAV is not set
  # CONFIG_SND_SERIAL_U16550 is not set
  # CONFIG_SND_MPU401 is not set
- 
- #
- # PCI devices
- #
+ CONFIG_SND_PCI=y
  # CONFIG_SND_AD1889 is not set
  # CONFIG_SND_ALS300 is not set
  # CONFIG_SND_ALS4000 is not set
@@@ -1602,36 -1639,14 +1638,14 @@@ CONFIG_SND_HDA_GENERIC=
  # CONFIG_SND_VIRTUOSO is not set
  # CONFIG_SND_VX222 is not set
  # CONFIG_SND_YMFPCI is not set
- 
- #
- # USB devices
- #
+ CONFIG_SND_USB=y
  # CONFIG_SND_USB_AUDIO is not set
  # CONFIG_SND_USB_USX2Y is not set
  # CONFIG_SND_USB_CAIAQ is not set
- 
- #
- # PCMCIA devices
- #
+ CONFIG_SND_PCMCIA=y
  # CONFIG_SND_VXPOCKET is not set
  # CONFIG_SND_PDAUDIOCF is not set
- 
- #
- # System on Chip audio support
- #
  # CONFIG_SND_SOC is not set
- 
- #
- # ALSA SoC audio for Freescale SOCs
- #
- 
- #
- # SoC Audio for the Texas Instruments OMAP
- #
- 
- #
- # Open Sound System
- #
  # CONFIG_SOUND_PRIME is not set
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
@@@ -1667,6 -1682,7 +1681,7 @@@ CONFIG_USB_DEVICEFS=
  # CONFIG_USB_DYNAMIC_MINORS is not set
  CONFIG_USB_SUSPEND=y
  # CONFIG_USB_OTG is not set
+ CONFIG_USB_MON=y
  
  #
  # USB Host Controller Drivers
@@@ -1690,6 -1706,7 +1705,7 @@@ CONFIG_USB_UHCI_HCD=
  #
  # CONFIG_USB_ACM is not set
  CONFIG_USB_PRINTER=y
+ # CONFIG_USB_WDM is not set
  
  #
  # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@@ -1711,6 -1728,7 +1727,7 @@@ CONFIG_USB_STORAGE=
  # CONFIG_USB_STORAGE_ALAUDA is not set
  # CONFIG_USB_STORAGE_ONETOUCH is not set
  # CONFIG_USB_STORAGE_KARMA is not set
+ # CONFIG_USB_STORAGE_SIERRA is not set
  # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
  CONFIG_USB_LIBUSUAL=y
  
@@@ -1719,7 -1737,6 +1736,6 @@@
  #
  # CONFIG_USB_MDC800 is not set
  # CONFIG_USB_MICROTEK is not set
- CONFIG_USB_MON=y
  
  #
  # USB port drivers
@@@ -1732,7 -1749,6 +1748,6 @@@
  # CONFIG_USB_EMI62 is not set
  # CONFIG_USB_EMI26 is not set
  # CONFIG_USB_ADUTUX is not set
- # CONFIG_USB_AUERSWALD is not set
  # CONFIG_USB_RIO500 is not set
  # CONFIG_USB_LEGOTOWER is not set
  # CONFIG_USB_LCD is not set
@@@ -1749,6 -1765,7 +1764,7 @@@
  # CONFIG_USB_TRANCEVIBRATOR is not set
  # CONFIG_USB_IOWARRIOR is not set
  # CONFIG_USB_TEST is not set
+ # CONFIG_USB_ISIGHTFW is not set
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@@ -1758,7 -1775,9 +1774,9 @@@ CONFIG_LEDS_CLASS=
  #
  # LED drivers
  #
+ # CONFIG_LEDS_PCA9532 is not set
  # CONFIG_LEDS_CLEVO_MAIL is not set
+ # CONFIG_LEDS_PCA955X is not set
  
  #
  # LED Triggers
@@@ -1804,6 -1823,7 +1822,7 @@@ CONFIG_RTC_INTF_DEV=
  # CONFIG_RTC_DRV_PCF8583 is not set
  # CONFIG_RTC_DRV_M41T80 is not set
  # CONFIG_RTC_DRV_S35390A is not set
+ # CONFIG_RTC_DRV_FM3130 is not set
  
  #
  # SPI RTC drivers
@@@ -1836,11 -1856,13 +1855,13 @@@ CONFIG_DMADEVICES=
  # Firmware Drivers
  #
  # CONFIG_EDD is not set
+ CONFIG_FIRMWARE_MEMMAP=y
  CONFIG_EFI_VARS=y
  # CONFIG_DELL_RBU is not set
  # CONFIG_DCDBAS is not set
  CONFIG_DMIID=y
- # CONFIG_ISCSI_IBFT_FIND is not set
+ CONFIG_ISCSI_IBFT_FIND=y
+ CONFIG_ISCSI_IBFT=y
  
  #
  # File systems
@@@ -1919,14 -1941,27 +1940,27 @@@ CONFIG_HUGETLB_PAGE=
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
+ # CONFIG_OMFS_FS is not set
  # CONFIG_HPFS_FS is not set
  # CONFIG_QNX4FS_FS is not set
  # CONFIG_ROMFS_FS is not set
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y
- # CONFIG_NFS_FS is not set
+ CONFIG_NFS_FS=y
+ CONFIG_NFS_V3=y
+ CONFIG_NFS_V3_ACL=y
+ CONFIG_NFS_V4=y
+ CONFIG_ROOT_NFS=y
  # CONFIG_NFSD is not set
+ CONFIG_LOCKD=y
+ CONFIG_LOCKD_V4=y
+ CONFIG_NFS_ACL_SUPPORT=y
+ CONFIG_NFS_COMMON=y
+ CONFIG_SUNRPC=y
+ CONFIG_SUNRPC_GSS=y
+ CONFIG_RPCSEC_GSS_KRB5=y
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
  # CONFIG_CIFS is not set
  # CONFIG_NCP_FS is not set
@@@ -2000,9 -2035,9 +2034,9 @@@ CONFIG_NLS_UTF8=
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
- # CONFIG_PRINTK_TIME is not set
- # CONFIG_ENABLE_WARN_DEPRECATED is not set
- # CONFIG_ENABLE_MUST_CHECK is not set
+ CONFIG_PRINTK_TIME=y
+ CONFIG_ENABLE_WARN_DEPRECATED=y
+ CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
  CONFIG_MAGIC_SYSRQ=y
  # CONFIG_UNUSED_SYMBOLS is not set
@@@ -2032,6 -2067,7 +2066,7 @@@ CONFIG_DEBUG_BUGVERBOSE=
  # CONFIG_DEBUG_INFO is not set
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
+ CONFIG_DEBUG_MEMORY_INIT=y
  # CONFIG_DEBUG_LIST is not set
  # CONFIG_DEBUG_SG is not set
  CONFIG_FRAME_POINTER=y
@@@ -2042,23 -2078,32 +2077,32 @@@
  # CONFIG_LKDTM is not set
  # CONFIG_FAULT_INJECTION is not set
  # CONFIG_LATENCYTOP is not set
+ CONFIG_SYSCTL_SYSCALL_CHECK=y
+ CONFIG_HAVE_FTRACE=y
+ CONFIG_HAVE_DYNAMIC_FTRACE=y
+ # CONFIG_FTRACE is not set
+ # CONFIG_IRQSOFF_TRACER is not set
+ # CONFIG_SYSPROF_TRACER is not set
+ # CONFIG_SCHED_TRACER is not set
+ # CONFIG_CONTEXT_SWITCH_TRACER is not set
  CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
  # CONFIG_SAMPLES is not set
- # CONFIG_KGDB is not set
  CONFIG_HAVE_ARCH_KGDB=y
- # CONFIG_NONPROMISC_DEVMEM is not set
+ # CONFIG_KGDB is not set
+ # CONFIG_STRICT_DEVMEM is not set
+ CONFIG_X86_VERBOSE_BOOTUP=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_DEBUG_STACKOVERFLOW=y
  CONFIG_DEBUG_STACK_USAGE=y
  # CONFIG_DEBUG_PAGEALLOC is not set
+ # CONFIG_DEBUG_PER_CPU_MAPS is not set
  # CONFIG_X86_PTDUMP is not set
  CONFIG_DEBUG_RODATA=y
  # CONFIG_DEBUG_RODATA_TEST is not set
  CONFIG_DEBUG_NX_TEST=m
  # CONFIG_4KSTACKS is not set
- CONFIG_X86_FIND_SMP_CONFIG=y
- CONFIG_X86_MPPARSE=y
  CONFIG_DOUBLEFAULT=y
+ # CONFIG_MMIOTRACE is not set
  CONFIG_IO_DELAY_TYPE_0X80=0
  CONFIG_IO_DELAY_TYPE_0XED=1
  CONFIG_IO_DELAY_TYPE_UDELAY=2
@@@ -2070,6 -2115,7 +2114,7 @@@ CONFIG_IO_DELAY_0X80=
  CONFIG_DEFAULT_IO_DELAY_TYPE=0
  CONFIG_DEBUG_BOOT_PARAMS=y
  # CONFIG_CPA_DEBUG is not set
+ # CONFIG_OPTIMIZE_INLINING is not set
  
  #
  # Security options
@@@ -2079,7 -2125,6 +2124,6 @@@ CONFIG_KEYS_DEBUG_PROC_KEYS=
  CONFIG_SECURITY=y
  CONFIG_SECURITY_NETWORK=y
  # CONFIG_SECURITY_NETWORK_XFRM is not set
- CONFIG_SECURITY_CAPABILITIES=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
  # CONFIG_SECURITY_ROOTPLUG is not set
  CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
@@@ -2140,6 -2185,10 +2184,10 @@@ CONFIG_CRYPTO_HMAC=
  # CONFIG_CRYPTO_MD4 is not set
  CONFIG_CRYPTO_MD5=y
  # CONFIG_CRYPTO_MICHAEL_MIC is not set
+ # CONFIG_CRYPTO_RMD128 is not set
+ # CONFIG_CRYPTO_RMD160 is not set
+ # CONFIG_CRYPTO_RMD256 is not set
+ # CONFIG_CRYPTO_RMD320 is not set
  CONFIG_CRYPTO_SHA1=y
  # CONFIG_CRYPTO_SHA256 is not set
  # CONFIG_CRYPTO_SHA512 is not set
@@@ -2150,7 -2199,7 +2198,7 @@@
  # Ciphers
  #
  CONFIG_CRYPTO_AES=y
- # CONFIG_CRYPTO_AES_586 is not set
+ CONFIG_CRYPTO_AES_586=y
  # CONFIG_CRYPTO_ANUBIS is not set
  CONFIG_CRYPTO_ARC4=y
  # CONFIG_CRYPTO_BLOWFISH is not set
@@@ -2192,6 -2241,7 +2240,7 @@@ CONFIG_GENERIC_FIND_FIRST_BIT=
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  # CONFIG_CRC_CCITT is not set
  # CONFIG_CRC16 is not set
+ CONFIG_CRC_T10DIF=y
  # CONFIG_CRC_ITU_T is not set
  CONFIG_CRC32=y
  # CONFIG_CRC7 is not set

diff --combined arch/x86/configs/x86_64_defconfig
index 743e803,678c8ac..ab91941
--- 1/arch/x86/configs/x86_64_defconfig
--- 2/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@@ -1,13 -1,13 +1,13 @@@
  #
  # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.26-rc1
- # Sun May  4 19:59:57 2008
+ # Linux kernel version: 2.6.27-rc4
+ # Mon Aug 25 14:40:46 2008
  #
  CONFIG_64BIT=y
  # CONFIG_X86_32 is not set
  CONFIG_X86_64=y
  CONFIG_X86=y
- CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig"
+ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
  # CONFIG_GENERIC_LOCKBREAK is not set
  CONFIG_GENERIC_TIME=y
  CONFIG_GENERIC_CMOS_UPDATE=y
@@@ -53,6 -53,7 +53,7 @@@ CONFIG_X86_HT=
  CONFIG_X86_BIOS_REBOOT=y
  CONFIG_X86_TRAMPOLINE=y
  # CONFIG_KTIME_SCALAR is not set
+ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
  #
  # General setup
@@@ -82,6 -83,7 +83,7 @@@ CONFIG_CGROUPS=
  CONFIG_CGROUP_NS=y
  # CONFIG_CGROUP_DEVICE is not set
  CONFIG_CPUSETS=y
+ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
  CONFIG_GROUP_SCHED=y
  CONFIG_FAIR_GROUP_SCHED=y
  # CONFIG_RT_GROUP_SCHED is not set
@@@ -105,7 -107,6 +107,6 @@@ CONFIG_SYSCTL=
  # CONFIG_EMBEDDED is not set
  CONFIG_UID16=y
  CONFIG_SYSCTL_SYSCALL=y
- CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_KALLSYMS=y
  CONFIG_KALLSYMS_ALL=y
  CONFIG_KALLSYMS_EXTRA_PASS=y
@@@ -113,6 -114,7 +114,7 @@@ CONFIG_HOTPLUG=
  CONFIG_PRINTK=y
  CONFIG_BUG=y
  CONFIG_ELF_CORE=y
+ CONFIG_PCSPKR_PLATFORM=y
  # CONFIG_COMPAT_BRK is not set
  CONFIG_BASE_FULL=y
  CONFIG_FUTEX=y
@@@ -132,25 -134,33 +134,33 @@@ CONFIG_MARKERS=
  # CONFIG_OPROFILE is not set
  CONFIG_HAVE_OPROFILE=y
  CONFIG_KPROBES=y
+ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
  CONFIG_KRETPROBES=y
+ CONFIG_HAVE_IOREMAP_PROT=y
  CONFIG_HAVE_KPROBES=y
  CONFIG_HAVE_KRETPROBES=y
+ # CONFIG_HAVE_ARCH_TRACEHOOK is not set
  # CONFIG_HAVE_DMA_ATTRS is not set
+ CONFIG_USE_GENERIC_SMP_HELPERS=y
+ # CONFIG_HAVE_CLK is not set
  CONFIG_PROC_PAGE_MONITOR=y
+ # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
  CONFIG_SLABINFO=y
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
  CONFIG_MODULES=y
+ # CONFIG_MODULE_FORCE_LOAD is not set
  CONFIG_MODULE_UNLOAD=y
  CONFIG_MODULE_FORCE_UNLOAD=y
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
- # CONFIG_KMOD is not set
+ CONFIG_KMOD=y
  CONFIG_STOP_MACHINE=y
  CONFIG_BLOCK=y
  CONFIG_BLK_DEV_IO_TRACE=y
  CONFIG_BLK_DEV_BSG=y
+ # CONFIG_BLK_DEV_INTEGRITY is not set
  CONFIG_BLOCK_COMPAT=y
  
  #
@@@ -175,20 -185,15 +185,15 @@@ CONFIG_NO_HZ=
  CONFIG_HIGH_RES_TIMERS=y
  CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  CONFIG_SMP=y
+ CONFIG_X86_FIND_SMP_CONFIG=y
+ CONFIG_X86_MPPARSE=y
  CONFIG_X86_PC=y
  # CONFIG_X86_ELAN is not set
  # CONFIG_X86_VOYAGER is not set
- # CONFIG_X86_NUMAQ is not set
- # CONFIG_X86_SUMMIT is not set
- # CONFIG_X86_BIGSMP is not set
- # CONFIG_X86_VISWS is not set
  # CONFIG_X86_GENERICARCH is not set
- # CONFIG_X86_ES7000 is not set
- # CONFIG_X86_RDC321X is not set
  # CONFIG_X86_VSMP is not set
  # CONFIG_PARAVIRT_GUEST is not set
- CONFIG_MEMTEST_BOOTPARAM=y
- CONFIG_MEMTEST_BOOTPARAM_VALUE=0
+ # CONFIG_MEMTEST is not set
  # CONFIG_M386 is not set
  # CONFIG_M486 is not set
  # CONFIG_M586 is not set
@@@ -220,11 -225,12 +225,12 @@@ CONFIG_X86_L1_CACHE_BYTES=6
  CONFIG_X86_INTERNODE_CACHE_BYTES=64
  CONFIG_X86_CMPXCHG=y
  CONFIG_X86_L1_CACHE_SHIFT=6
- CONFIG_X86_GOOD_APIC=y
+ CONFIG_X86_WP_WORKS_OK=y
  CONFIG_X86_INTEL_USERCOPY=y
  CONFIG_X86_USE_PPRO_CHECKSUM=y
  CONFIG_X86_P6_NOP=y
  CONFIG_X86_TSC=y
+ CONFIG_X86_CMPXCHG64=y
  CONFIG_X86_CMOV=y
  CONFIG_X86_MINIMUM_CPU_FAMILY=64
  CONFIG_X86_DEBUGCTLMSR=y
@@@ -234,8 -240,10 +240,10 @@@ CONFIG_DMI=
  CONFIG_GART_IOMMU=y
  CONFIG_CALGARY_IOMMU=y
  CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+ CONFIG_AMD_IOMMU=y
  CONFIG_SWIOTLB=y
  CONFIG_IOMMU_HELPER=y
+ # CONFIG_MAXSMP is not set
  CONFIG_NR_CPUS=4
  # CONFIG_SCHED_SMT is not set
  CONFIG_SCHED_MC=y
@@@ -281,6 -289,7 +289,7 @@@ CONFIG_ZONE_DMA_FLAG=
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
  CONFIG_MTRR=y
+ # CONFIG_MTRR_SANITIZER is not set
  # CONFIG_X86_PAT is not set
  CONFIG_EFI=y
  CONFIG_SECCOMP=y
@@@ -313,6 -322,7 +322,7 @@@ CONFIG_PM_TRACE_RTC=
  CONFIG_PM_SLEEP_SMP=y
  CONFIG_PM_SLEEP=y
  CONFIG_SUSPEND=y
+ # CONFIG_PM_TEST_SUSPEND is not set
  CONFIG_SUSPEND_FREEZER=y
  CONFIG_HIBERNATION=y
  CONFIG_PM_STD_PARTITION=""
@@@ -339,6 -349,7 +349,7 @@@ CONFIG_ACPI_NUMA=
  CONFIG_ACPI_BLACKLIST_YEAR=0
  # CONFIG_ACPI_DEBUG is not set
  CONFIG_ACPI_EC=y
+ # CONFIG_ACPI_PCI_SLOT is not set
  CONFIG_ACPI_POWER=y
  CONFIG_ACPI_SYSTEM=y
  CONFIG_X86_PM_TIMER=y
@@@ -437,10 -448,6 +448,6 @@@ CONFIG_IA32_EMULATION=
  CONFIG_COMPAT=y
  CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
  CONFIG_SYSVIPC_COMPAT=y
- 
- #
- # Networking
- #
  CONFIG_NET=y
  
  #
@@@ -464,7 -471,10 +471,10 @@@ CONFIG_IP_FIB_HASH=
  CONFIG_IP_MULTIPLE_TABLES=y
  CONFIG_IP_ROUTE_MULTIPATH=y
  CONFIG_IP_ROUTE_VERBOSE=y
- # CONFIG_IP_PNP is not set
+ CONFIG_IP_PNP=y
+ CONFIG_IP_PNP_DHCP=y
+ CONFIG_IP_PNP_BOOTP=y
+ CONFIG_IP_PNP_RARP=y
  # CONFIG_NET_IPIP is not set
  # CONFIG_NET_IPGRE is not set
  CONFIG_IP_MROUTE=y
@@@ -607,7 -617,6 +617,6 @@@ CONFIG_NET_SCHED=
  # CONFIG_NET_SCH_HTB is not set
  # CONFIG_NET_SCH_HFSC is not set
  # CONFIG_NET_SCH_PRIO is not set
- # CONFIG_NET_SCH_RR is not set
  # CONFIG_NET_SCH_RED is not set
  # CONFIG_NET_SCH_SFQ is not set
  # CONFIG_NET_SCH_TEQL is not set
@@@ -669,28 -678,19 +678,19 @@@ CONFIG_FIB_RULES=
  CONFIG_CFG80211=y
  CONFIG_NL80211=y
  CONFIG_WIRELESS_EXT=y
+ CONFIG_WIRELESS_EXT_SYSFS=y
  CONFIG_MAC80211=y
  
  #
  # Rate control algorithm selection
  #
+ CONFIG_MAC80211_RC_PID=y
  CONFIG_MAC80211_RC_DEFAULT_PID=y
- # CONFIG_MAC80211_RC_DEFAULT_NONE is not set
- 
- #
- # Selecting 'y' for an algorithm will
- #
- 
- #
- # build the algorithm into mac80211.
- #
  CONFIG_MAC80211_RC_DEFAULT="pid"
- CONFIG_MAC80211_RC_PID=y
  # CONFIG_MAC80211_MESH is not set
  CONFIG_MAC80211_LEDS=y
  # CONFIG_MAC80211_DEBUGFS is not set
- # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
- # CONFIG_MAC80211_DEBUG is not set
+ # CONFIG_MAC80211_DEBUG_MENU is not set
  # CONFIG_IEEE80211 is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
@@@ -706,6 -706,8 +706,8 @@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=y
+ CONFIG_FIRMWARE_IN_KERNEL=y
+ CONFIG_EXTRA_FIRMWARE=""
  # CONFIG_DEBUG_DRIVER is not set
  CONFIG_DEBUG_DEVRES=y
  # CONFIG_SYS_HYPERVISOR is not set
@@@ -738,6 -740,7 +740,7 @@@ CONFIG_BLK_DEV_RAM_SIZE=1638
  # CONFIG_BLK_DEV_XIP is not set
  # CONFIG_CDROM_PKTCDVD is not set
  # CONFIG_ATA_OVER_ETH is not set
+ # CONFIG_BLK_DEV_HD is not set
  CONFIG_MISC_DEVICES=y
  # CONFIG_IBM_ASM is not set
  # CONFIG_PHANTOM is not set
@@@ -748,10 -751,14 +751,14 @@@
  # CONFIG_ASUS_LAPTOP is not set
  # CONFIG_FUJITSU_LAPTOP is not set
  # CONFIG_MSI_LAPTOP is not set
+ # CONFIG_COMPAL_LAPTOP is not set
  # CONFIG_SONY_LAPTOP is not set
  # CONFIG_THINKPAD_ACPI is not set
  # CONFIG_INTEL_MENLOW is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+ # CONFIG_SGI_XP is not set
+ # CONFIG_HP_ILO is not set
+ # CONFIG_SGI_GRU is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@@ -790,12 -797,13 +797,13 @@@ CONFIG_SCSI_WAIT_SCAN=
  #
  CONFIG_SCSI_SPI_ATTRS=y
  # CONFIG_SCSI_FC_ATTRS is not set
- # CONFIG_SCSI_ISCSI_ATTRS is not set
+ CONFIG_SCSI_ISCSI_ATTRS=y
  # CONFIG_SCSI_SAS_ATTRS is not set
  # CONFIG_SCSI_SAS_LIBSAS is not set
  # CONFIG_SCSI_SRP_ATTRS is not set
  # CONFIG_SCSI_LOWLEVEL is not set
  # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+ # CONFIG_SCSI_DH is not set
  CONFIG_ATA=y
  # CONFIG_ATA_NONSTANDARD is not set
  CONFIG_ATA_ACPI=y
@@@ -857,6 -865,7 +865,7 @@@ CONFIG_PATA_OLDPIIX=
  # CONFIG_PATA_SIS is not set
  # CONFIG_PATA_VIA is not set
  # CONFIG_PATA_WINBOND is not set
+ CONFIG_PATA_SCH=y
  CONFIG_MD=y
  CONFIG_BLK_DEV_MD=y
  # CONFIG_MD_LINEAR is not set
@@@ -880,13 -889,16 +889,16 @@@ CONFIG_DM_ZERO=
  #
  # IEEE 1394 (FireWire) support
  #
+ 
+ #
+ # Enable only one of the two stacks, unless you know what you are doing
+ #
  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
  CONFIG_MACINTOSH_DRIVERS=y
  CONFIG_MAC_EMUMOUSEBTN=y
  CONFIG_NETDEVICES=y
- # CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_IFB is not set
  # CONFIG_DUMMY is not set
  # CONFIG_BONDING is not set
@@@ -896,7 -908,23 +908,23 @@@
  # CONFIG_VETH is not set
  # CONFIG_NET_SB1000 is not set
  # CONFIG_ARCNET is not set
- # CONFIG_PHYLIB is not set
+ CONFIG_PHYLIB=y
+ 
+ #
+ # MII PHY device drivers
+ #
+ # CONFIG_MARVELL_PHY is not set
+ # CONFIG_DAVICOM_PHY is not set
+ # CONFIG_QSEMI_PHY is not set
+ # CONFIG_LXT_PHY is not set
+ # CONFIG_CICADA_PHY is not set
+ # CONFIG_VITESSE_PHY is not set
+ # CONFIG_SMSC_PHY is not set
+ # CONFIG_BROADCOM_PHY is not set
+ # CONFIG_ICPLUS_PHY is not set
+ # CONFIG_REALTEK_PHY is not set
+ # CONFIG_FIXED_PHY is not set
+ # CONFIG_MDIO_BITBANG is not set
  CONFIG_NET_ETHERNET=y
  CONFIG_MII=y
  # CONFIG_HAPPYMEAL is not set
@@@ -940,16 -968,15 +968,15 @@@ CONFIG_8139TOO_PIO=
  # CONFIG_SIS900 is not set
  # CONFIG_EPIC100 is not set
  # CONFIG_SUNDANCE is not set
+ # CONFIG_TLAN is not set
  # CONFIG_VIA_RHINE is not set
  # CONFIG_SC92031 is not set
  CONFIG_NETDEV_1000=y
  # CONFIG_ACENIC is not set
  # CONFIG_DL2K is not set
  CONFIG_E1000=y
- # CONFIG_E1000_NAPI is not set
  # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
  # CONFIG_E1000E is not set
- # CONFIG_E1000E_ENABLED is not set
  # CONFIG_IP1000 is not set
  # CONFIG_IGB is not set
  # CONFIG_NS83820 is not set
@@@ -965,6 -992,7 +992,7 @@@ CONFIG_TIGON3=
  # CONFIG_BNX2 is not set
  # CONFIG_QLA3XXX is not set
  # CONFIG_ATL1 is not set
+ # CONFIG_ATL1E is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
  # CONFIG_CHELSIO_T3 is not set
@@@ -1003,13 -1031,14 +1031,14 @@@ CONFIG_WLAN_80211=
  # CONFIG_RTL8180 is not set
  # CONFIG_RTL8187 is not set
  # CONFIG_ADM8211 is not set
+ # CONFIG_MAC80211_HWSIM is not set
  # CONFIG_P54_COMMON is not set
  CONFIG_ATH5K=y
  # CONFIG_ATH5K_DEBUG is not set
- # CONFIG_IWLWIFI is not set
+ # CONFIG_ATH9K is not set
  # CONFIG_IWLCORE is not set
  # CONFIG_IWLWIFI_LEDS is not set
- # CONFIG_IWL4965 is not set
+ # CONFIG_IWLAGN is not set
  # CONFIG_IWL3945 is not set
  # CONFIG_HOSTAP is not set
  # CONFIG_B43 is not set
@@@ -1088,6 -1117,7 +1117,7 @@@ CONFIG_MOUSE_PS2_TRACKPOINT=
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  # CONFIG_MOUSE_SERIAL is not set
  # CONFIG_MOUSE_APPLETOUCH is not set
+ # CONFIG_MOUSE_BCM5974 is not set
  # CONFIG_MOUSE_VSXXXAA is not set
  CONFIG_INPUT_JOYSTICK=y
  # CONFIG_JOYSTICK_ANALOG is not set
@@@ -1122,12 -1152,14 +1152,14 @@@ CONFIG_INPUT_TOUCHSCREEN=
  # CONFIG_TOUCHSCREEN_GUNZE is not set
  # CONFIG_TOUCHSCREEN_ELO is not set
  # CONFIG_TOUCHSCREEN_MTOUCH is not set
+ # CONFIG_TOUCHSCREEN_INEXIO is not set
  # CONFIG_TOUCHSCREEN_MK712 is not set
  # CONFIG_TOUCHSCREEN_PENMOUNT is not set
  # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
  # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
  # CONFIG_TOUCHSCREEN_UCB1400 is not set
  # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+ # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
  CONFIG_INPUT_MISC=y
  # CONFIG_INPUT_PCSPKR is not set
  # CONFIG_INPUT_APANEL is not set
@@@ -1155,6 -1187,7 +1187,7 @@@ CONFIG_SERIO_LIBPS2=
  # Character devices
  #
  CONFIG_VT=y
+ CONFIG_CONSOLE_TRANSLATIONS=y
  CONFIG_VT_CONSOLE=y
  CONFIG_HW_CONSOLE=y
  CONFIG_VT_HW_CONSOLE_BINDING=y
@@@ -1222,7 -1255,6 +1255,6 @@@ CONFIG_NVRAM=
  # CONFIG_PC8736x_GPIO is not set
  # CONFIG_RAW_DRIVER is not set
  CONFIG_HPET=y
- # CONFIG_HPET_RTC_IRQ is not set
  # CONFIG_HPET_MMAP is not set
  # CONFIG_HANGCHECK_TIMER is not set
  # CONFIG_TCG_TPM is not set
@@@ -1231,42 -1263,63 +1263,63 @@@ CONFIG_DEVPORT=
  CONFIG_I2C=y
  CONFIG_I2C_BOARDINFO=y
  # CONFIG_I2C_CHARDEV is not set
+ CONFIG_I2C_HELPER_AUTO=y
  
  #
  # I2C Hardware Bus support
  #
+ 
+ #
+ # PC SMBus host controller drivers
+ #
  # CONFIG_I2C_ALI1535 is not set
  # CONFIG_I2C_ALI1563 is not set
  # CONFIG_I2C_ALI15X3 is not set
  # CONFIG_I2C_AMD756 is not set
  # CONFIG_I2C_AMD8111 is not set
  CONFIG_I2C_I801=y
- # CONFIG_I2C_I810 is not set
+ # CONFIG_I2C_ISCH is not set
  # CONFIG_I2C_PIIX4 is not set
  # CONFIG_I2C_NFORCE2 is not set
- # CONFIG_I2C_OCORES is not set
- # CONFIG_I2C_PARPORT_LIGHT is not set
- # CONFIG_I2C_PROSAVAGE is not set
- # CONFIG_I2C_SAVAGE4 is not set
- # CONFIG_I2C_SIMTEC is not set
  # CONFIG_I2C_SIS5595 is not set
  # CONFIG_I2C_SIS630 is not set
  # CONFIG_I2C_SIS96X is not set
- # CONFIG_I2C_TAOS_EVM is not set
- # CONFIG_I2C_STUB is not set
- # CONFIG_I2C_TINY_USB is not set
  # CONFIG_I2C_VIA is not set
  # CONFIG_I2C_VIAPRO is not set
+ 
+ #
+ # I2C system bus drivers (mostly embedded / system-on-chip)
+ #
+ # CONFIG_I2C_OCORES is not set
+ # CONFIG_I2C_SIMTEC is not set
+ 
+ #
+ # External I2C/SMBus adapter drivers
+ #
+ # CONFIG_I2C_PARPORT_LIGHT is not set
+ # CONFIG_I2C_TAOS_EVM is not set
+ # CONFIG_I2C_TINY_USB is not set
+ 
+ #
+ # Graphics adapter I2C/DDC channel drivers
+ #
  # CONFIG_I2C_VOODOO3 is not set
+ 
+ #
+ # Other I2C/SMBus bus drivers
+ #
  # CONFIG_I2C_PCA_PLATFORM is not set
+ # CONFIG_I2C_STUB is not set
  
  #
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
+ # CONFIG_AT24 is not set
  # CONFIG_SENSORS_EEPROM is not set
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
+ # CONFIG_SENSORS_PCA9539 is not set
  # CONFIG_SENSORS_PCF8591 is not set
  # CONFIG_SENSORS_MAX6875 is not set
  # CONFIG_SENSORS_TSL2550 is not set
@@@ -1275,6 -1328,8 +1328,8 @@@
  # CONFIG_I2C_DEBUG_BUS is not set
  # CONFIG_I2C_DEBUG_CHIP is not set
  # CONFIG_SPI is not set
+ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+ # CONFIG_GPIOLIB is not set
  # CONFIG_W1 is not set
  CONFIG_POWER_SUPPLY=y
  # CONFIG_POWER_SUPPLY_DEBUG is not set
@@@ -1335,8 -1390,10 +1390,10 @@@ CONFIG_SSB_POSSIBLE=
  #
  # Multifunction device drivers
  #
+ # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+ # CONFIG_MFD_TMIO is not set
  
  #
  # Multimedia devices
@@@ -1347,6 -1404,7 +1404,7 @@@
  #
  # CONFIG_VIDEO_DEV is not set
  # CONFIG_DVB_CORE is not set
+ # CONFIG_VIDEO_MEDIA is not set
  
  #
  # Multimedia drivers
@@@ -1387,7 -1445,6 +1445,6 @@@ CONFIG_FB_CFB_IMAGEBLIT=
  # CONFIG_FB_SYS_IMAGEBLIT is not set
  # CONFIG_FB_FOREIGN_ENDIAN is not set
  # CONFIG_FB_SYS_FOPS is not set
- CONFIG_FB_DEFERRED_IO=y
  # CONFIG_FB_SVGALIB is not set
  # CONFIG_FB_MACMODES is not set
  # CONFIG_FB_BACKLIGHT is not set
@@@ -1430,6 -1487,7 +1487,7 @@@ CONFIG_FB_EFI=
  # CONFIG_FB_TRIDENT is not set
  # CONFIG_FB_ARK is not set
  # CONFIG_FB_PM3 is not set
+ # CONFIG_FB_CARMINE is not set
  # CONFIG_FB_GEODE is not set
  # CONFIG_FB_VIRTUAL is not set
  CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@@ -1437,6 -1495,7 +1495,7 @@@
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
  # CONFIG_BACKLIGHT_CORGI is not set
  # CONFIG_BACKLIGHT_PROGEAR is not set
+ # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
  
  #
  # Display device support
@@@ -1449,21 -1508,14 +1508,13 @@@
  CONFIG_VGA_CONSOLE=y
  CONFIG_VGACON_SOFT_SCROLLBACK=y
  CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 -CONFIG_VIDEO_SELECT=y
  CONFIG_DUMMY_CONSOLE=y
  # CONFIG_FRAMEBUFFER_CONSOLE is not set
  CONFIG_LOGO=y
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set
  CONFIG_LOGO_LINUX_CLUT224=y
- 
- #
- # Sound
- #
  CONFIG_SOUND=y
- 
- #
- # Advanced Linux Sound Architecture
- #
  CONFIG_SND=y
  CONFIG_SND_TIMER=y
  CONFIG_SND_PCM=y
@@@ -1481,20 -1533,14 +1532,14 @@@ CONFIG_SND_VERBOSE_PROCFS=
  # CONFIG_SND_VERBOSE_PRINTK is not set
  # CONFIG_SND_DEBUG is not set
  CONFIG_SND_VMASTER=y
- 
- #
- # Generic devices
- #
+ CONFIG_SND_DRIVERS=y
  # CONFIG_SND_PCSP is not set
  # CONFIG_SND_DUMMY is not set
  # CONFIG_SND_VIRMIDI is not set
  # CONFIG_SND_MTPAV is not set
  # CONFIG_SND_SERIAL_U16550 is not set
  # CONFIG_SND_MPU401 is not set
- 
- #
- # PCI devices
- #
+ CONFIG_SND_PCI=y
  # CONFIG_SND_AD1889 is not set
  # CONFIG_SND_ALS300 is not set
  # CONFIG_SND_ALS4000 is not set
@@@ -1567,36 -1613,14 +1612,14 @@@ CONFIG_SND_HDA_GENERIC=
  # CONFIG_SND_VIRTUOSO is not set
  # CONFIG_SND_VX222 is not set
  # CONFIG_SND_YMFPCI is not set
- 
- #
- # USB devices
- #
+ CONFIG_SND_USB=y
  # CONFIG_SND_USB_AUDIO is not set
  # CONFIG_SND_USB_USX2Y is not set
  # CONFIG_SND_USB_CAIAQ is not set
- 
- #
- # PCMCIA devices
- #
+ CONFIG_SND_PCMCIA=y
  # CONFIG_SND_VXPOCKET is not set
  # CONFIG_SND_PDAUDIOCF is not set
- 
- #
- # System on Chip audio support
- #
  # CONFIG_SND_SOC is not set
- 
- #
- # ALSA SoC audio for Freescale SOCs
- #
- 
- #
- # SoC Audio for the Texas Instruments OMAP
- #
- 
- #
- # Open Sound System
- #
  # CONFIG_SOUND_PRIME is not set
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
@@@ -1632,6 -1656,7 +1655,7 @@@ CONFIG_USB_DEVICEFS=
  # CONFIG_USB_DYNAMIC_MINORS is not set
  CONFIG_USB_SUSPEND=y
  # CONFIG_USB_OTG is not set
+ CONFIG_USB_MON=y
  
  #
  # USB Host Controller Drivers
@@@ -1655,6 -1680,7 +1679,7 @@@ CONFIG_USB_UHCI_HCD=
  #
  # CONFIG_USB_ACM is not set
  CONFIG_USB_PRINTER=y
+ # CONFIG_USB_WDM is not set
  
  #
  # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@@ -1676,6 -1702,7 +1701,7 @@@ CONFIG_USB_STORAGE=
  # CONFIG_USB_STORAGE_ALAUDA is not set
  # CONFIG_USB_STORAGE_ONETOUCH is not set
  # CONFIG_USB_STORAGE_KARMA is not set
+ # CONFIG_USB_STORAGE_SIERRA is not set
  # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
  CONFIG_USB_LIBUSUAL=y
  
@@@ -1684,7 -1711,6 +1710,6 @@@
  #
  # CONFIG_USB_MDC800 is not set
  # CONFIG_USB_MICROTEK is not set
- CONFIG_USB_MON=y
  
  #
  # USB port drivers
@@@ -1697,7 -1723,6 +1722,6 @@@
  # CONFIG_USB_EMI62 is not set
  # CONFIG_USB_EMI26 is not set
  # CONFIG_USB_ADUTUX is not set
- # CONFIG_USB_AUERSWALD is not set
  # CONFIG_USB_RIO500 is not set
  # CONFIG_USB_LEGOTOWER is not set
  # CONFIG_USB_LCD is not set
@@@ -1714,6 -1739,7 +1738,7 @@@
  # CONFIG_USB_TRANCEVIBRATOR is not set
  # CONFIG_USB_IOWARRIOR is not set
  # CONFIG_USB_TEST is not set
+ # CONFIG_USB_ISIGHTFW is not set
  # CONFIG_USB_GADGET is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@@ -1723,7 -1749,9 +1748,9 @@@ CONFIG_LEDS_CLASS=
  #
  # LED drivers
  #
+ # CONFIG_LEDS_PCA9532 is not set
  # CONFIG_LEDS_CLEVO_MAIL is not set
+ # CONFIG_LEDS_PCA955X is not set
  
  #
  # LED Triggers
@@@ -1769,6 -1797,7 +1796,7 @@@ CONFIG_RTC_INTF_DEV=
  # CONFIG_RTC_DRV_PCF8583 is not set
  # CONFIG_RTC_DRV_M41T80 is not set
  # CONFIG_RTC_DRV_S35390A is not set
+ # CONFIG_RTC_DRV_FM3130 is not set
  
  #
  # SPI RTC drivers
@@@ -1801,11 -1830,13 +1829,13 @@@ CONFIG_DMADEVICES=
  # Firmware Drivers
  #
  # CONFIG_EDD is not set
+ CONFIG_FIRMWARE_MEMMAP=y
  CONFIG_EFI_VARS=y
  # CONFIG_DELL_RBU is not set
  # CONFIG_DCDBAS is not set
  CONFIG_DMIID=y
- # CONFIG_ISCSI_IBFT_FIND is not set
+ CONFIG_ISCSI_IBFT_FIND=y
+ CONFIG_ISCSI_IBFT=y
  
  #
  # File systems
@@@ -1885,14 -1916,27 +1915,27 @@@ CONFIG_HUGETLB_PAGE=
  # CONFIG_CRAMFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
+ # CONFIG_OMFS_FS is not set
  # CONFIG_HPFS_FS is not set
  # CONFIG_QNX4FS_FS is not set
  # CONFIG_ROMFS_FS is not set
  # CONFIG_SYSV_FS is not set
  # CONFIG_UFS_FS is not set
  CONFIG_NETWORK_FILESYSTEMS=y
- # CONFIG_NFS_FS is not set
+ CONFIG_NFS_FS=y
+ CONFIG_NFS_V3=y
+ CONFIG_NFS_V3_ACL=y
+ CONFIG_NFS_V4=y
+ CONFIG_ROOT_NFS=y
  # CONFIG_NFSD is not set
+ CONFIG_LOCKD=y
+ CONFIG_LOCKD_V4=y
+ CONFIG_NFS_ACL_SUPPORT=y
+ CONFIG_NFS_COMMON=y
+ CONFIG_SUNRPC=y
+ CONFIG_SUNRPC_GSS=y
+ CONFIG_RPCSEC_GSS_KRB5=y
+ # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
  # CONFIG_CIFS is not set
  # CONFIG_NCP_FS is not set
@@@ -1966,9 -2010,9 +2009,9 @@@ CONFIG_NLS_UTF8=
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
- # CONFIG_PRINTK_TIME is not set
- # CONFIG_ENABLE_WARN_DEPRECATED is not set
- # CONFIG_ENABLE_MUST_CHECK is not set
+ CONFIG_PRINTK_TIME=y
+ CONFIG_ENABLE_WARN_DEPRECATED=y
+ CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
  CONFIG_MAGIC_SYSRQ=y
  # CONFIG_UNUSED_SYMBOLS is not set
@@@ -1997,6 -2041,7 +2040,7 @@@ CONFIG_DEBUG_BUGVERBOSE=
  # CONFIG_DEBUG_INFO is not set
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
+ CONFIG_DEBUG_MEMORY_INIT=y
  # CONFIG_DEBUG_LIST is not set
  # CONFIG_DEBUG_SG is not set
  CONFIG_FRAME_POINTER=y
@@@ -2007,11 -2052,20 +2051,20 @@@
  # CONFIG_LKDTM is not set
  # CONFIG_FAULT_INJECTION is not set
  # CONFIG_LATENCYTOP is not set
+ CONFIG_SYSCTL_SYSCALL_CHECK=y
+ CONFIG_HAVE_FTRACE=y
+ CONFIG_HAVE_DYNAMIC_FTRACE=y
+ # CONFIG_FTRACE is not set
+ # CONFIG_IRQSOFF_TRACER is not set
+ # CONFIG_SYSPROF_TRACER is not set
+ # CONFIG_SCHED_TRACER is not set
+ # CONFIG_CONTEXT_SWITCH_TRACER is not set
  CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
  # CONFIG_SAMPLES is not set
- # CONFIG_KGDB is not set
  CONFIG_HAVE_ARCH_KGDB=y
- # CONFIG_NONPROMISC_DEVMEM is not set
+ # CONFIG_KGDB is not set
+ # CONFIG_STRICT_DEVMEM is not set
+ CONFIG_X86_VERBOSE_BOOTUP=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_DEBUG_STACKOVERFLOW=y
  CONFIG_DEBUG_STACK_USAGE=y
@@@ -2022,8 -2076,8 +2075,8 @@@ CONFIG_DEBUG_RODATA=
  # CONFIG_DIRECT_GBPAGES is not set
  # CONFIG_DEBUG_RODATA_TEST is not set
  CONFIG_DEBUG_NX_TEST=m
- CONFIG_X86_MPPARSE=y
  # CONFIG_IOMMU_DEBUG is not set
+ # CONFIG_MMIOTRACE is not set
  CONFIG_IO_DELAY_TYPE_0X80=0
  CONFIG_IO_DELAY_TYPE_0XED=1
  CONFIG_IO_DELAY_TYPE_UDELAY=2
@@@ -2035,6 -2089,7 +2088,7 @@@ CONFIG_IO_DELAY_0X80=
  CONFIG_DEFAULT_IO_DELAY_TYPE=0
  CONFIG_DEBUG_BOOT_PARAMS=y
  # CONFIG_CPA_DEBUG is not set
+ # CONFIG_OPTIMIZE_INLINING is not set
  
  #
  # Security options
@@@ -2044,7 -2099,6 +2098,6 @@@ CONFIG_KEYS_DEBUG_PROC_KEYS=
  CONFIG_SECURITY=y
  CONFIG_SECURITY_NETWORK=y
  # CONFIG_SECURITY_NETWORK_XFRM is not set
- CONFIG_SECURITY_CAPABILITIES=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
  # CONFIG_SECURITY_ROOTPLUG is not set
  CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
@@@ -2105,6 -2159,10 +2158,10 @@@ CONFIG_CRYPTO_HMAC=
  # CONFIG_CRYPTO_MD4 is not set
  CONFIG_CRYPTO_MD5=y
  # CONFIG_CRYPTO_MICHAEL_MIC is not set
+ # CONFIG_CRYPTO_RMD128 is not set
+ # CONFIG_CRYPTO_RMD160 is not set
+ # CONFIG_CRYPTO_RMD256 is not set
+ # CONFIG_CRYPTO_RMD320 is not set
  CONFIG_CRYPTO_SHA1=y
  # CONFIG_CRYPTO_SHA256 is not set
  # CONFIG_CRYPTO_SHA512 is not set
@@@ -2154,6 -2212,7 +2211,7 @@@ CONFIG_GENERIC_FIND_FIRST_BIT=
  CONFIG_GENERIC_FIND_NEXT_BIT=y
  # CONFIG_CRC_CCITT is not set
  # CONFIG_CRC16 is not set
+ CONFIG_CRC_T10DIF=y
  # CONFIG_CRC_ITU_T is not set
  CONFIG_CRC32=y
  # CONFIG_CRC7 is not set

diff --combined drivers/video/Kconfig
index d58509a,70d135e..3773d7d
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -678,6 -678,7 +678,6 @@@ config FB_VES
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
 -      select VIDEO_SELECT
        help
          This is the frame buffer device driver for generic VESA 2.0
          compliant graphic cards. The older VESA 1.2 cards are not supported.
@@@ -1582,6 -1583,7 +1582,6 @@@ config FB_CYBL
        tristate "Cyberblade/i1 support"
        depends on FB && PCI && X86_32 && !64BIT
        select FB_CFB_IMAGEBLIT
 -      select VIDEO_SELECT
        ---help---
          This driver is supposed to support the Trident Cyberblade/i1
          graphics core integrated in the VIA VT8601A North Bridge,
@@@ -1656,6 -1658,32 +1656,32 @@@ config FB_PM
          similar boards, 3DLabs Permedia3 Create!, Appian Jeronimo 2000
          and maybe other boards.
  
+ config FB_CARMINE
+       tristate "Fujitsu carmine frame buffer support"
+       depends on FB && PCI
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This is the frame buffer device driver for the Fujitsu Carmine chip.
+         The driver provides two independent frame buffer devices.
+ 
+ choice
+       depends on FB_CARMINE
+       prompt "DRAM timing"
+       default FB_CARMINE_DRAM_EVAL
+ 
+ config FB_CARMINE_DRAM_EVAL
+       bool "Eval board timings"
+       help
+         Use timings which work on the eval card.
+ 
+ config CARMINE_DRAM_CUSTOM
+       bool "Custom board timings"
+       help
+         Use custom board timings.
+ endchoice
+ 
  config FB_AU1100
        bool "Au1100 LCD Driver"
        depends on (FB = y) && MIPS && SOC_AU1100
@@@ -1838,6 -1866,16 +1864,16 @@@ config FB_W10
  
          If unsure, say N.
  
+ config FB_SH_MOBILE_LCDC
+       tristate "SuperH Mobile LCDC framebuffer support"
+       depends on FB && SUPERH
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       default m
+       ---help---
+         Frame buffer driver for the on-chip SH-Mobile LCD controller.
+ 
  config FB_S3C2410
        tristate "S3C2410 LCD framebuffer support"
        depends on FB && ARCH_S3C2410
@@@ -1949,6 -1987,23 +1985,23 @@@ config FB_AM200EP
           This enables support for the Metronome display controller used on
           the E-Ink AM-200 EPD devkit.
  
+ config FB_COBALT
+       tristate "Cobalt server LCD frame buffer support"
+       depends on FB && MIPS_COBALT
+ 
+ config FB_SH7760
+        bool "SH7760/SH7763 LCDC support"
+        depends on FB && (CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7763)
+        select FB_CFB_FILLRECT
+        select FB_CFB_COPYAREA
+        select FB_CFB_IMAGEBLIT
+        help
+          Support for the SH7760/SH7763 integrated (D)STN/TFT LCD Controller.
+          Supports display resolutions up to 1024x1024 pixel, grayscale and
+          color operation, with depths ranging from 1 bpp to 8 bpp monochrome
+          and 8, 15 or 16 bpp color; 90 degrees clockwise display rotation for
+          panels <= 320 pixel horizontal resolution.
+ 
  config FB_VIRTUAL
        tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
        depends on FB