Merge commit 'jwb/jwb-merge' into merge

Manual merge of:
	arch/powerpc/configs/44x/warp_defconfig

diff --combined arch/powerpc/configs/44x/sam440ep_defconfig
index ce28cd6f0d4f89b04eb62ed100188616e5676e60,2e45a87162eb6bd2afb2416eb055131abcbaadab..70d5c3fa32837f418b4b4bd25707824f4fef0690
--- 1/arch/powerpc/configs/44x/sam440ep_defconfig
--- 2/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.28-rc2
- # Tue Oct 28 09:16:15 2008
+ # Linux kernel version: 2.6.29-rc2
+ # Tue Jan 20 08:22:42 2009
  #
  # CONFIG_PPC64 is not set
  
@@@ -19,6 -19,7 +19,7 @@@ CONFIG_4xx=
  CONFIG_BOOKE=y
  CONFIG_PTE_64BIT=y
  CONFIG_PHYS_64BIT=y
+ CONFIG_PPC_MMU_NOHASH=y
  # CONFIG_PPC_MM_SLICES is not set
  CONFIG_NOT_COHERENT_CACHE=y
  CONFIG_PPC32=y
@@@ -44,7 -45,7 +45,7 @@@ CONFIG_GENERIC_FIND_NEXT_BIT=
  CONFIG_PPC=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_GENERIC_NVRAM=y
- CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+ CONFIG_SCHED_OMIT_FRAME_POINTER=y
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y
@@@ -76,12 -77,12 +77,12 @@@ CONFIG_POSIX_MQUEUE=
  CONFIG_IKCONFIG=y
  # CONFIG_IKCONFIG_PROC is not set
  CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
  CONFIG_GROUP_SCHED=y
  CONFIG_FAIR_GROUP_SCHED=y
  # CONFIG_RT_GROUP_SCHED is not set
  CONFIG_USER_SCHED=y
  # CONFIG_CGROUP_SCHED is not set
+ # CONFIG_CGROUPS is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
@@@ -115,7 -116,6 +116,6 @@@ CONFIG_SLUB_DEBUG=
  CONFIG_SLUB=y
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
- # CONFIG_MARKERS is not set
  CONFIG_HAVE_OPROFILE=y
  # CONFIG_KPROBES is not set
  CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@@ -126,7 -126,6 +126,6 @@@ CONFIG_HAVE_ARCH_TRACEHOOK=
  # 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
@@@ -134,11 -133,9 +133,9 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
- CONFIG_KMOD=y
  CONFIG_BLOCK=y
  # CONFIG_LBD is not set
  # CONFIG_BLK_DEV_IO_TRACE is not set
- # CONFIG_LSF is not set
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
  
@@@ -155,6 -152,10 +152,10 @@@ CONFIG_DEFAULT_AS=
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+ # CONFIG_TREE_RCU is not set
+ # CONFIG_PREEMPT_RCU is not set
+ # CONFIG_TREE_RCU_TRACE is not set
+ # CONFIG_PREEMPT_RCU_TRACE is not set
  # CONFIG_FREEZER is not set
  # CONFIG_PPC4xx_PCI_EXPRESS is not set
  
@@@ -193,6 -194,7 +194,7 @@@ CONFIG_IBM440EP_ERR42=
  # CONFIG_GENERIC_IOMAP is not set
  # CONFIG_CPU_FREQ is not set
  # CONFIG_FSL_ULI1575 is not set
+ # CONFIG_SIMPLE_GPIO is not set
  
  #
  # Kernel options
@@@ -216,6 -218,7 +218,7 @@@ CONFIG_BINFMT_ELF=
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_MATH_EMULATION is not set
  # CONFIG_IOMMU_HELPER is not set
+ CONFIG_PPC_NEED_DMA_SYNC_OPS=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
  CONFIG_ARCH_HAS_WALK_MEMORY=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@@ -230,12 -233,14 +233,14 @@@ CONFIG_FLAT_NODE_MEM_MAP=
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_MIGRATION=y
- CONFIG_RESOURCES_64BIT=y
  CONFIG_PHYS_ADDR_T_64BIT=y
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
  CONFIG_UNEVICTABLE_LRU=y
+ CONFIG_PPC_4K_PAGES=y
+ # CONFIG_PPC_16K_PAGES is not set
+ # CONFIG_PPC_64K_PAGES is not set
  CONFIG_FORCE_MAX_ZONEORDER=11
  CONFIG_PROC_DEVICETREE=y
  CONFIG_CMDLINE_BOOL=y
@@@ -258,6 -263,7 +263,7 @@@ CONFIG_PCI_SYSCALL=
  CONFIG_ARCH_SUPPORTS_MSI=y
  # CONFIG_PCI_MSI is not set
  CONFIG_PCI_LEGACY=y
+ # CONFIG_PCI_STUB is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  # CONFIG_HAS_RAPIDIO is not set
@@@ -282,6 -288,7 +288,7 @@@ CONFIG_NET=
  #
  # Networking options
  #
+ CONFIG_COMPAT_NET_DEV_OPS=y
  CONFIG_PACKET=y
  # CONFIG_PACKET_MMAP is not set
  CONFIG_UNIX=y
@@@ -332,6 -339,7 +339,7 @@@ CONFIG_DEFAULT_TCP_CONG="cubic
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
  # CONFIG_NET_SCHED is not set
+ # CONFIG_DCB is not set
  
  #
  # Network testing
@@@ -344,6 -352,7 +352,7 @@@
  # CONFIG_AF_RXRPC is not set
  # CONFIG_PHONET is not set
  # CONFIG_WIRELESS is not set
+ # CONFIG_WIMAX is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@@ -550,6 -559,10 +559,10 @@@ CONFIG_IBM_NEW_EMAC_ZMII=
  # CONFIG_WLAN_80211 is not set
  # CONFIG_IWLWIFI_LEDS is not set
  
+ #
+ # Enable WiMAX (Networking options) to see the WiMAX drivers
+ #
+ 
  #
  # USB Network Adapters
  #
@@@ -605,6 -618,7 +618,7 @@@ CONFIG_MOUSE_PS2_LOGIPS2PP=
  CONFIG_MOUSE_PS2_SYNAPTICS=y
  CONFIG_MOUSE_PS2_LIFEBOOK=y
  CONFIG_MOUSE_PS2_TRACKPOINT=y
+ # CONFIG_MOUSE_PS2_ELANTECH is not set
  # CONFIG_MOUSE_PS2_TOUCHKIT is not set
  # CONFIG_MOUSE_SERIAL is not set
  # CONFIG_MOUSE_APPLETOUCH is not set
@@@ -661,9 -675,12 +675,12 @@@ CONFIG_SERIAL_CORE=
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_JSM is not set
  CONFIG_SERIAL_OF_PLATFORM=y
+ # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
  CONFIG_UNIX98_PTYS=y
+ # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_HVC_UDBG is not set
  # CONFIG_IPMI_HANDLER is not set
  # CONFIG_HW_RANDOM is not set
  # CONFIG_NVRAM is not set
@@@ -730,8 -747,8 +747,8 @@@ CONFIG_I2C_IBM_IIC=
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
 -# CONFIG_AT24 is not set
 -# CONFIG_SENSORS_EEPROM is not set
 +# CONFIG_EEPROM_AT24 is not set
 +# CONFIG_EEPROM_LEGACY is not set
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCA9539 is not set
@@@ -751,11 -768,11 +768,11 @@@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=
  # CONFIG_THERMAL is not set
  # CONFIG_THERMAL_HWMON is not set
  # CONFIG_WATCHDOG is not set
+ CONFIG_SSB_POSSIBLE=y
  
  #
  # Sonics Silicon Backplane
  #
- CONFIG_SSB_POSSIBLE=y
  # CONFIG_SSB is not set
  
  #
@@@ -764,9 -781,13 +781,13 @@@
  # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+ # CONFIG_TWL4030_CORE is not set
  # CONFIG_MFD_TMIO is not set
+ # CONFIG_PMIC_DA903X is not set
  # CONFIG_MFD_WM8400 is not set
  # CONFIG_MFD_WM8350_I2C is not set
+ # CONFIG_MFD_PCF50633 is not set
+ # CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@@ -848,12 -869,13 +869,13 @@@ CONFIG_FB_RADEON_BACKLIGHT=
  # CONFIG_FB_IBM_GXT4500 is not set
  # CONFIG_FB_VIRTUAL is not set
  # CONFIG_FB_METRONOME is not set
+ # CONFIG_FB_MB862XX is not set
  CONFIG_BACKLIGHT_LCD_SUPPORT=y
  CONFIG_LCD_CLASS_DEVICE=y
  # CONFIG_LCD_ILI9320 is not set
  # CONFIG_LCD_PLATFORM is not set
  CONFIG_BACKLIGHT_CLASS_DEVICE=y
- # CONFIG_BACKLIGHT_CORGI is not set
+ CONFIG_BACKLIGHT_GENERIC=y
  
  #
  # Display device support
@@@ -894,11 -916,9 +916,9 @@@ CONFIG_HID_COMPAT=
  CONFIG_HID_A4TECH=y
  CONFIG_HID_APPLE=y
  CONFIG_HID_BELKIN=y
- CONFIG_HID_BRIGHT=y
  CONFIG_HID_CHERRY=y
  CONFIG_HID_CHICONY=y
  CONFIG_HID_CYPRESS=y
- CONFIG_HID_DELL=y
  CONFIG_HID_EZKEY=y
  CONFIG_HID_GYRATION=y
  CONFIG_HID_LOGITECH=y
@@@ -906,12 -926,15 +926,15 @@@
  # CONFIG_LOGIRUMBLEPAD2_FF is not set
  CONFIG_HID_MICROSOFT=y
  CONFIG_HID_MONTEREY=y
+ # CONFIG_HID_NTRIG is not set
  CONFIG_HID_PANTHERLORD=y
  # CONFIG_PANTHERLORD_FF is not set
  CONFIG_HID_PETALYNX=y
  CONFIG_HID_SAMSUNG=y
  CONFIG_HID_SONY=y
  CONFIG_HID_SUNPLUS=y
+ # CONFIG_GREENASIA_FF is not set
+ # CONFIG_HID_TOPSEED is not set
  CONFIG_THRUSTMASTER_FF=m
  CONFIG_ZEROPLUS_FF=m
  CONFIG_USB_SUPPORT=y
@@@ -943,6 -966,7 +966,7 @@@ CONFIG_USB_EHCI_HCD=
  # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
  # CONFIG_USB_EHCI_TT_NEWSCHED is not set
  CONFIG_USB_EHCI_HCD_PPC_OF=y
+ # CONFIG_USB_OXU210HP_HCD is not set
  # CONFIG_USB_ISP116X_HCD is not set
  # CONFIG_USB_ISP1760_HCD is not set
  CONFIG_USB_OHCI_HCD=y
@@@ -968,18 -992,17 +992,17 @@@ CONFIG_USB_OHCI_LITTLE_ENDIAN=
  # CONFIG_USB_TMC is not set
  
  #
- # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+ # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  
  #
- # may also be needed; see USB_STORAGE Help for more information
+ # see USB_STORAGE Help for more information
  #
  CONFIG_USB_STORAGE=m
  # CONFIG_USB_STORAGE_DEBUG is not set
  # CONFIG_USB_STORAGE_DATAFAB is not set
  # CONFIG_USB_STORAGE_FREECOM is not set
  # CONFIG_USB_STORAGE_ISD200 is not set
- # CONFIG_USB_STORAGE_DPCM is not set
  # CONFIG_USB_STORAGE_USBAT is not set
  # CONFIG_USB_STORAGE_SDDR09 is not set
  # CONFIG_USB_STORAGE_SDDR55 is not set
@@@ -1027,6 -1050,10 +1050,10 @@@
  # CONFIG_USB_ISIGHTFW is not set
  # CONFIG_USB_VST is not set
  # CONFIG_USB_GADGET is not set
+ 
+ #
+ # OTG and related infrastructure
+ #
  # CONFIG_UWB is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@@ -1065,6 -1092,7 +1092,7 @@@ CONFIG_RTC_DRV_M41T80=
  CONFIG_RTC_DRV_M41T80_WDT=y
  # CONFIG_RTC_DRV_S35390A is not set
  # CONFIG_RTC_DRV_FM3130 is not set
+ # CONFIG_RTC_DRV_RX8581 is not set
  
  #
  # SPI RTC drivers
@@@ -1117,6 -1145,7 +1145,7 @@@ CONFIG_FS_POSIX_ACL=
  CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
  # CONFIG_OCFS2_FS is not set
+ # CONFIG_BTRFS_FS is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@@ -1156,10 -1185,7 +1185,7 @@@ CONFIG_TMPFS=
  # CONFIG_TMPFS_POSIX_ACL is not set
  # CONFIG_HUGETLB_PAGE is not set
  # CONFIG_CONFIGFS_FS is not set
- 
- #
- # Miscellaneous filesystems
- #
+ CONFIG_MISC_FILESYSTEMS=y
  # CONFIG_ADFS_FS is not set
  CONFIG_AFFS_FS=m
  # CONFIG_HFS_FS is not set
@@@ -1168,6 -1194,7 +1194,7 @@@
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
  # CONFIG_CRAMFS is not set
+ # CONFIG_SQUASHFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
  # CONFIG_OMFS_FS is not set
@@@ -1245,6 -1272,7 +1272,7 @@@ CONFIG_NLS_ISO8859_1=
  # Library routines
  #
  CONFIG_BITREVERSE=y
+ CONFIG_GENERIC_FIND_LAST_BIT=y
  # CONFIG_CRC_CCITT is not set
  # CONFIG_CRC16 is not set
  CONFIG_CRC_T10DIF=y
@@@ -1278,12 -1306,17 +1306,17 @@@ CONFIG_MAGIC_SYSRQ=
  # CONFIG_RCU_CPU_STALL_DETECTOR is not set
  # CONFIG_LATENCYTOP is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
- CONFIG_NOP_TRACER=y
- CONFIG_HAVE_FTRACE=y
+ CONFIG_HAVE_FUNCTION_TRACER=y
  CONFIG_HAVE_DYNAMIC_FTRACE=y
+ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+ 
+ #
+ # Tracers
+ #
  # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_HAVE_ARCH_KGDB=y
+ CONFIG_PRINT_STACK_DEPTH=64
  # CONFIG_IRQSTACKS is not set
  # CONFIG_PPC_EARLY_DEBUG is not set
  

diff --combined arch/powerpc/configs/44x/warp_defconfig
index 031ac6d4212f836a2b6796508bc523c01b839b14,260c81f985151e7ebb5dc2438c068b6ca4e2c2d3..3b77f092abe12d4ef3c234d0e62a1985ce498a74
--- 1/arch/powerpc/configs/44x/warp_defconfig
--- 2/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.28-rc2
- # Tue Oct 28 09:16:22 2008
+ # Linux kernel version: 2.6.29-rc2
+ # Fri Jan 23 07:57:16 2009
  #
  # CONFIG_PPC64 is not set
  
@@@ -19,6 -19,7 +19,7 @@@ CONFIG_4xx=
  CONFIG_BOOKE=y
  CONFIG_PTE_64BIT=y
  CONFIG_PHYS_64BIT=y
+ CONFIG_PPC_MMU_NOHASH=y
  # CONFIG_PPC_MM_SLICES is not set
  CONFIG_NOT_COHERENT_CACHE=y
  CONFIG_PPC32=y
@@@ -44,7 -45,7 +45,7 @@@ CONFIG_GENERIC_FIND_NEXT_BIT=
  CONFIG_PPC=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_GENERIC_NVRAM=y
- CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+ CONFIG_SCHED_OMIT_FRAME_POINTER=y
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y
@@@ -75,12 -76,12 +76,12 @@@ CONFIG_SYSVIPC_SYSCTL=
  # CONFIG_AUDIT is not set
  # CONFIG_IKCONFIG is not set
  CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
  CONFIG_GROUP_SCHED=y
  CONFIG_FAIR_GROUP_SCHED=y
  # CONFIG_RT_GROUP_SCHED is not set
  CONFIG_USER_SCHED=y
  # CONFIG_CGROUP_SCHED is not set
+ # CONFIG_CGROUPS is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
@@@ -113,7 -114,6 +114,6 @@@ CONFIG_SLAB=
  # CONFIG_SLUB is not set
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
- # CONFIG_MARKERS is not set
  CONFIG_HAVE_OPROFILE=y
  # CONFIG_KPROBES is not set
  CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@@ -124,7 -124,6 +124,6 @@@ CONFIG_HAVE_ARCH_TRACEHOOK=
  # 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
@@@ -132,11 -131,9 +131,9 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
- CONFIG_KMOD=y
  CONFIG_BLOCK=y
  # CONFIG_LBD is not set
  # CONFIG_BLK_DEV_IO_TRACE is not set
- # CONFIG_LSF is not set
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
  
@@@ -153,6 -150,10 +150,10 @@@ CONFIG_DEFAULT_AS=
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+ # CONFIG_TREE_RCU is not set
+ # CONFIG_PREEMPT_RCU is not set
+ # CONFIG_TREE_RCU_TRACE is not set
+ # CONFIG_PREEMPT_RCU_TRACE is not set
  # CONFIG_FREEZER is not set
  
  #
@@@ -190,6 -191,7 +191,7 @@@ CONFIG_IBM440EP_ERR42=
  # CONFIG_GENERIC_IOMAP is not set
  # CONFIG_CPU_FREQ is not set
  # CONFIG_FSL_ULI1575 is not set
+ # CONFIG_SIMPLE_GPIO is not set
  
  #
  # Kernel options
@@@ -213,6 -215,7 +215,7 @@@ CONFIG_BINFMT_ELF=
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_MATH_EMULATION is not set
  # CONFIG_IOMMU_HELPER is not set
+ CONFIG_PPC_NEED_DMA_SYNC_OPS=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
  CONFIG_ARCH_HAS_WALK_MEMORY=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@@ -227,12 -230,14 +230,14 @@@ CONFIG_FLAT_NODE_MEM_MAP=
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_MIGRATION=y
- CONFIG_RESOURCES_64BIT=y
  CONFIG_PHYS_ADDR_T_64BIT=y
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
  CONFIG_UNEVICTABLE_LRU=y
+ CONFIG_PPC_4K_PAGES=y
+ # CONFIG_PPC_16K_PAGES is not set
+ # CONFIG_PPC_64K_PAGES is not set
  CONFIG_FORCE_MAX_ZONEORDER=11
  CONFIG_PROC_DEVICETREE=y
  CONFIG_CMDLINE_BOOL=y
@@@ -273,6 -278,7 +278,7 @@@ CONFIG_NET=
  #
  # Networking options
  #
+ CONFIG_COMPAT_NET_DEV_OPS=y
  CONFIG_PACKET=y
  # CONFIG_PACKET_MMAP is not set
  CONFIG_UNIX=y
@@@ -348,6 -354,7 +354,7 @@@ CONFIG_VLAN_8021Q=
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
  # CONFIG_NET_SCHED is not set
+ # CONFIG_DCB is not set
  
  #
  # Network testing
@@@ -360,6 -367,7 +367,7 @@@
  # CONFIG_AF_RXRPC is not set
  # CONFIG_PHONET is not set
  # CONFIG_WIRELESS is not set
+ # CONFIG_WIMAX is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@@ -380,8 -388,9 +388,9 @@@ CONFIG_MTD=
  # CONFIG_MTD_DEBUG is not set
  # CONFIG_MTD_CONCAT is not set
  CONFIG_MTD_PARTITIONS=y
+ # CONFIG_MTD_TESTS is not set
  # CONFIG_MTD_REDBOOT_PARTS is not set
- # CONFIG_MTD_CMDLINE_PARTS is not set
+ CONFIG_MTD_CMDLINE_PARTS=y
  CONFIG_MTD_OF_PARTS=y
  # CONFIG_MTD_AR7_PARTS is not set
  
@@@ -396,7 -405,7 +405,7 @@@ CONFIG_MTD_BLOCK=
  # CONFIG_INFTL is not set
  # CONFIG_RFD_FTL is not set
  # CONFIG_SSFDC is not set
- CONFIG_MTD_OOPS=m
+ # CONFIG_MTD_OOPS is not set
  
  #
  # RAM/ROM/Flash chip drivers
@@@ -450,6 -459,7 +459,7 @@@ CONFIG_MTD_NAND=
  CONFIG_MTD_NAND_ECC_SMC=y
  # CONFIG_MTD_NAND_MUSEUM_IDS is not set
  CONFIG_MTD_NAND_IDS=y
+ CONFIG_MTD_NAND_NDFC=y
  # CONFIG_MTD_NAND_DISKONCHIP is not set
  # CONFIG_MTD_NAND_NANDSIM is not set
  # CONFIG_MTD_NAND_PLATFORM is not set
@@@ -457,6 -467,12 +467,12 @@@
  # CONFIG_MTD_NAND_FSL_ELBC is not set
  # CONFIG_MTD_ONENAND is not set
  
+ #
+ # LPDDR flash memory drivers
+ #
+ # CONFIG_MTD_LPDDR is not set
+ # CONFIG_MTD_QINFO_PROBE is not set
+ 
  #
  # UBI - Unsorted block images
  #
@@@ -480,7 -496,9 +496,9 @@@ CONFIG_BLK_DEV_RAM_SIZE=409
  # CONFIG_BLK_DEV_HD is not set
  CONFIG_MISC_DEVICES=y
  # CONFIG_EEPROM_93CX6 is not set
+ # CONFIG_ICS932S401 is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
+ # CONFIG_C2PORT is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@@ -561,6 -579,10 +579,10 @@@ CONFIG_IBM_NEW_EMAC_ZMII=
  # CONFIG_WLAN_80211 is not set
  # CONFIG_IWLWIFI_LEDS is not set
  
+ #
+ # Enable WiMAX (Networking options) to see the WiMAX drivers
+ #
+ 
  #
  # USB Network Adapters
  #
@@@ -616,9 -638,12 +638,12 @@@ CONFIG_SERIAL_8250_SHARE_IRQ=
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_OF_PLATFORM is not set
+ # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
  CONFIG_UNIX98_PTYS=y
+ # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_HVC_UDBG is not set
  # CONFIG_IPMI_HANDLER is not set
  CONFIG_HW_RANDOM=y
  # CONFIG_NVRAM is not set
@@@ -638,7 -663,7 +663,7 @@@ CONFIG_I2C_HELPER_AUTO=
  #
  # I2C system bus drivers (mostly embedded / system-on-chip)
  #
- # CONFIG_I2C_IBM_IIC is not set
+ CONFIG_I2C_IBM_IIC=y
  # CONFIG_I2C_MPC is not set
  # CONFIG_I2C_OCORES is not set
  # CONFIG_I2C_SIMTEC is not set
@@@ -660,8 -685,8 +685,8 @@@
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
- # CONFIG_EEPROM_AT24 is not set
 -CONFIG_AT24=y
 -# CONFIG_SENSORS_EEPROM is not set
++CONFIG_EEPROM_AT24=y
 +CONFIG_EEPROM_LEGACY=y
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCA9539 is not set
@@@ -679,7 -704,7 +704,7 @@@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=
  # CONFIG_POWER_SUPPLY is not set
  CONFIG_HWMON=y
  # CONFIG_HWMON_VID is not set
- # CONFIG_SENSORS_AD7414 is not set
+ CONFIG_SENSORS_AD7414=y
  # CONFIG_SENSORS_AD7418 is not set
  # CONFIG_SENSORS_ADM1021 is not set
  # CONFIG_SENSORS_ADM1025 is not set
@@@ -687,8 -712,10 +712,10 @@@
  # CONFIG_SENSORS_ADM1029 is not set
  # CONFIG_SENSORS_ADM1031 is not set
  # CONFIG_SENSORS_ADM9240 is not set
+ # CONFIG_SENSORS_ADT7462 is not set
  # CONFIG_SENSORS_ADT7470 is not set
  # CONFIG_SENSORS_ADT7473 is not set
+ # CONFIG_SENSORS_ADT7475 is not set
  # CONFIG_SENSORS_ATXP1 is not set
  # CONFIG_SENSORS_DS1621 is not set
  # CONFIG_SENSORS_F71805F is not set
@@@ -708,6 -735,7 +735,7 @@@
  # CONFIG_SENSORS_LM90 is not set
  # CONFIG_SENSORS_LM92 is not set
  # CONFIG_SENSORS_LM93 is not set
+ # CONFIG_SENSORS_LTC4245 is not set
  # CONFIG_SENSORS_MAX1619 is not set
  # CONFIG_SENSORS_MAX6650 is not set
  # CONFIG_SENSORS_PC87360 is not set
@@@ -729,13 -757,26 +757,26 @@@
  # CONFIG_SENSORS_W83627EHF is not set
  # CONFIG_HWMON_DEBUG_CHIP is not set
  CONFIG_THERMAL=y
- # CONFIG_THERMAL_HWMON is not set
- # CONFIG_WATCHDOG is not set
+ CONFIG_THERMAL_HWMON=y
+ CONFIG_WATCHDOG=y
+ # CONFIG_WATCHDOG_NOWAYOUT is not set
  
  #
- # Sonics Silicon Backplane
+ # Watchdog Device Drivers
+ #
+ # CONFIG_SOFT_WATCHDOG is not set
+ CONFIG_PIKA_WDT=y
+ # CONFIG_BOOKE_WDT is not set
+ 
+ #
+ # USB-based Watchdog Cards
  #
+ # CONFIG_USBPCWATCHDOG is not set
  CONFIG_SSB_POSSIBLE=y
+ 
+ #
+ # Sonics Silicon Backplane
+ #
  # CONFIG_SSB is not set
  
  #
@@@ -744,9 -785,13 +785,13 @@@
  # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+ # CONFIG_TWL4030_CORE is not set
  # CONFIG_MFD_TMIO is not set
+ # CONFIG_PMIC_DA903X is not set
  # CONFIG_MFD_WM8400 is not set
  # CONFIG_MFD_WM8350_I2C is not set
+ # CONFIG_MFD_PCF50633 is not set
+ # CONFIG_REGULATOR is not set
  
  #
  # Multimedia devices
@@@ -802,6 -847,7 +847,7 @@@ CONFIG_USB_MON=
  # USB Host Controller Drivers
  #
  # CONFIG_USB_C67X00_HCD is not set
+ # CONFIG_USB_OXU210HP_HCD is not set
  # CONFIG_USB_ISP116X_HCD is not set
  # CONFIG_USB_ISP1760_HCD is not set
  CONFIG_USB_OHCI_HCD=y
@@@ -824,18 -870,17 +870,17 @@@ CONFIG_USB_OHCI_LITTLE_ENDIAN=
  # CONFIG_USB_TMC is not set
  
  #
- # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+ # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  
  #
- # may also be needed; see USB_STORAGE Help for more information
+ # see USB_STORAGE Help for more information
  #
  CONFIG_USB_STORAGE=y
  # CONFIG_USB_STORAGE_DEBUG is not set
  # CONFIG_USB_STORAGE_DATAFAB is not set
  # CONFIG_USB_STORAGE_FREECOM is not set
  # CONFIG_USB_STORAGE_ISD200 is not set
- # CONFIG_USB_STORAGE_DPCM is not set
  # CONFIG_USB_STORAGE_USBAT is not set
  # CONFIG_USB_STORAGE_SDDR09 is not set
  # CONFIG_USB_STORAGE_SDDR55 is not set
@@@ -880,14 -925,18 +925,18 @@@
  # CONFIG_USB_ISIGHTFW is not set
  # CONFIG_USB_VST is not set
  # CONFIG_USB_GADGET is not set
- CONFIG_MMC=m
+ 
+ #
+ # OTG and related infrastructure
+ #
+ CONFIG_MMC=y
  # CONFIG_MMC_DEBUG is not set
  # CONFIG_MMC_UNSAFE_RESUME is not set
  
  #
  # MMC/SD/SDIO Card Drivers
  #
- CONFIG_MMC_BLOCK=m
+ CONFIG_MMC_BLOCK=y
  CONFIG_MMC_BLOCK_BOUNCE=y
  # CONFIG_SDIO_UART is not set
  # CONFIG_MMC_TEST is not set
@@@ -898,7 -947,18 +947,18 @@@
  # CONFIG_MMC_SDHCI is not set
  # CONFIG_MMC_WBSD is not set
  # CONFIG_MEMSTICK is not set
- # CONFIG_NEW_LEDS is not set
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_CLASS=y
+ 
+ #
+ # LED drivers
+ #
+ # CONFIG_LEDS_PCA955X is not set
+ 
+ #
+ # LED Triggers
+ #
+ # CONFIG_LEDS_TRIGGERS is not set
  # CONFIG_ACCESSIBILITY is not set
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
@@@ -912,14 -972,18 +972,18 @@@
  CONFIG_EXT2_FS=y
  # CONFIG_EXT2_FS_XATTR is not set
  # CONFIG_EXT2_FS_XIP is not set
- # CONFIG_EXT3_FS is not set
+ CONFIG_EXT3_FS=y
+ # CONFIG_EXT3_FS_XATTR is not set
  # CONFIG_EXT4_FS is not set
+ CONFIG_JBD=y
+ # CONFIG_JBD_DEBUG is not set
  # CONFIG_REISERFS_FS is not set
  # CONFIG_JFS_FS is not set
  # CONFIG_FS_POSIX_ACL is not set
  CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
  # CONFIG_OCFS2_FS is not set
+ # CONFIG_BTRFS_FS is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@@ -952,13 -1016,11 +1016,11 @@@ CONFIG_PROC_KCORE=
  CONFIG_PROC_SYSCTL=y
  CONFIG_PROC_PAGE_MONITOR=y
  CONFIG_SYSFS=y
- # CONFIG_TMPFS is not set
+ CONFIG_TMPFS=y
+ # CONFIG_TMPFS_POSIX_ACL is not set
  # CONFIG_HUGETLB_PAGE is not set
  # CONFIG_CONFIGFS_FS is not set
- 
- #
- # Miscellaneous filesystems
- #
+ CONFIG_MISC_FILESYSTEMS=y
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  # CONFIG_HFS_FS is not set
@@@ -978,6 -1040,7 +1040,7 @@@ CONFIG_JFFS2_ZLIB=
  CONFIG_JFFS2_RTIME=y
  # CONFIG_JFFS2_RUBIN is not set
  CONFIG_CRAMFS=y
+ # CONFIG_SQUASHFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
  # CONFIG_OMFS_FS is not set
@@@ -1057,6 -1120,7 +1120,7 @@@ CONFIG_NLS_UTF8=
  # Library routines
  #
  CONFIG_BITREVERSE=y
+ CONFIG_GENERIC_FIND_LAST_BIT=y
  CONFIG_CRC_CCITT=y
  # CONFIG_CRC16 is not set
  CONFIG_CRC_T10DIF=y
@@@ -1107,6 -1171,7 +1171,7 @@@ CONFIG_DEBUG_INFO=
  # CONFIG_DEBUG_MEMORY_INIT is not set
  # CONFIG_DEBUG_LIST is not set
  # CONFIG_DEBUG_SG is not set
+ # CONFIG_DEBUG_NOTIFIERS is not set
  # CONFIG_BOOT_PRINTK_DELAY is not set
  # CONFIG_RCU_TORTURE_TEST is not set
  # CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@@ -1115,18 -1180,24 +1180,24 @@@
  # CONFIG_FAULT_INJECTION is not set
  # CONFIG_LATENCYTOP is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
- CONFIG_NOP_TRACER=y
- CONFIG_HAVE_FTRACE=y
+ CONFIG_HAVE_FUNCTION_TRACER=y
  CONFIG_HAVE_DYNAMIC_FTRACE=y
- # CONFIG_FTRACE is not set
+ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+ 
+ #
+ # Tracers
+ #
+ # CONFIG_FUNCTION_TRACER is not set
  # CONFIG_SCHED_TRACER is not set
  # CONFIG_CONTEXT_SWITCH_TRACER is not set
  # CONFIG_BOOT_TRACER is not set
+ # CONFIG_TRACE_BRANCH_PROFILING is not set
  # CONFIG_STACK_TRACER is not set
  # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_HAVE_ARCH_KGDB=y
  # CONFIG_KGDB is not set
+ CONFIG_PRINT_STACK_DEPTH=64
  # CONFIG_DEBUG_STACKOVERFLOW is not set
  # CONFIG_DEBUG_STACK_USAGE is not set
  # CONFIG_DEBUG_PAGEALLOC is not set
@@@ -1134,7 -1205,7 +1205,7 @@@
  # CONFIG_FTR_FIXUP_SELFTEST is not set
  # CONFIG_MSI_BITMAP_SELFTEST is not set
  # CONFIG_XMON is not set
- # CONFIG_IRQSTACKS is not set
+ CONFIG_IRQSTACKS=y
  # CONFIG_VIRQ_DEBUG is not set
  CONFIG_BDI_SWITCH=y
  # CONFIG_PPC_EARLY_DEBUG is not set
@@@ -1153,6 -1224,7 +1224,7 @@@ CONFIG_CRYPTO=
  #
  # CONFIG_CRYPTO_FIPS is not set
  # CONFIG_CRYPTO_MANAGER is not set
+ # CONFIG_CRYPTO_MANAGER2 is not set
  # CONFIG_CRYPTO_GF128MUL is not set
  # CONFIG_CRYPTO_NULL is not set
  # CONFIG_CRYPTO_CRYPTD is not set

diff --combined arch/powerpc/configs/ppc40x_defconfig
index 2d72ee7a8d60cb42edb40e6f4319eb4411daef71,5b2c1cbd7849d79a9c231128d0f061b18f686ca8..326205cabf77be142313abec36ae947909060e9e
--- 1/arch/powerpc/configs/ppc40x_defconfig
--- 2/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.28-rc4
- # Fri Nov 14 09:54:44 2008
+ # Linux kernel version: 2.6.29-rc2
+ # Fri Jan 23 08:44:03 2009
  #
  # CONFIG_PPC64 is not set
  
@@@ -15,6 -15,7 +15,7 @@@ CONFIG_40x=
  # CONFIG_44x is not set
  # CONFIG_E200 is not set
  CONFIG_4xx=y
+ CONFIG_PPC_MMU_NOHASH=y
  # CONFIG_PPC_MM_SLICES is not set
  CONFIG_NOT_COHERENT_CACHE=y
  CONFIG_PPC32=y
@@@ -41,7 -42,7 +42,7 @@@ CONFIG_GENERIC_GPIO=
  CONFIG_PPC=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_GENERIC_NVRAM=y
- CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+ CONFIG_SCHED_OMIT_FRAME_POINTER=y
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y
@@@ -72,12 -73,12 +73,12 @@@ CONFIG_POSIX_MQUEUE=
  # CONFIG_AUDIT is not set
  # CONFIG_IKCONFIG is not set
  CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
  CONFIG_GROUP_SCHED=y
  CONFIG_FAIR_GROUP_SCHED=y
  # CONFIG_RT_GROUP_SCHED is not set
  CONFIG_USER_SCHED=y
  # CONFIG_CGROUP_SCHED is not set
+ # CONFIG_CGROUPS is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
@@@ -90,6 -91,7 +91,7 @@@ CONFIG_EMBEDDED=
  CONFIG_SYSCTL_SYSCALL=y
  CONFIG_KALLSYMS=y
  CONFIG_KALLSYMS_ALL=y
+ CONFIG_KALLSYMS_STRIP_GENERATED=y
  CONFIG_KALLSYMS_EXTRA_PASS=y
  CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y
@@@ -112,7 -114,6 +114,6 @@@ CONFIG_SLUB_DEBUG=
  CONFIG_SLUB=y
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
- # CONFIG_MARKERS is not set
  CONFIG_HAVE_OPROFILE=y
  # CONFIG_KPROBES is not set
  CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@@ -123,7 -124,6 +124,6 @@@ CONFIG_HAVE_ARCH_TRACEHOOK=
  # 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
@@@ -131,11 -131,9 +131,9 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
- CONFIG_KMOD=y
  CONFIG_BLOCK=y
  CONFIG_LBD=y
  # CONFIG_BLK_DEV_IO_TRACE is not set
- # CONFIG_LSF is not set
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
  
@@@ -152,6 -150,10 +150,10 @@@ CONFIG_DEFAULT_AS=
  # CONFIG_DEFAULT_NOOP is not set
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_CLASSIC_RCU=y
+ # CONFIG_TREE_RCU is not set
+ # CONFIG_PREEMPT_RCU is not set
+ # CONFIG_TREE_RCU_TRACE is not set
+ # CONFIG_PREEMPT_RCU_TRACE is not set
  # CONFIG_FREEZER is not set
  CONFIG_PPC4xx_PCI_EXPRESS=y
  
@@@ -192,6 -194,7 +194,7 @@@ CONFIG_IBM405_ERR51=
  # CONFIG_CPU_FREQ is not set
  # CONFIG_FSL_ULI1575 is not set
  CONFIG_OF_RTC=y
+ # CONFIG_SIMPLE_GPIO is not set
  
  #
  # Kernel options
@@@ -215,6 -218,7 +218,7 @@@ CONFIG_BINFMT_ELF=
  # CONFIG_BINFMT_MISC is not set
  # CONFIG_MATH_EMULATION is not set
  # CONFIG_IOMMU_HELPER is not set
+ CONFIG_PPC_NEED_DMA_SYNC_OPS=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
  CONFIG_ARCH_HAS_WALK_MEMORY=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@@ -229,12 -233,14 +233,14 @@@ CONFIG_FLAT_NODE_MEM_MAP=
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_MIGRATION=y
- CONFIG_RESOURCES_64BIT=y
  # CONFIG_PHYS_ADDR_T_64BIT is not set
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
  CONFIG_UNEVICTABLE_LRU=y
+ CONFIG_PPC_4K_PAGES=y
+ # CONFIG_PPC_16K_PAGES is not set
+ # CONFIG_PPC_64K_PAGES is not set
  CONFIG_FORCE_MAX_ZONEORDER=11
  CONFIG_PROC_DEVICETREE=y
  # CONFIG_CMDLINE_BOOL is not set
@@@ -258,6 -264,7 +264,7 @@@ CONFIG_ARCH_SUPPORTS_MSI=
  # CONFIG_PCI_MSI is not set
  # CONFIG_PCI_LEGACY is not set
  # CONFIG_PCI_DEBUG is not set
+ # CONFIG_PCI_STUB is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  # CONFIG_HAS_RAPIDIO is not set
@@@ -282,6 -289,7 +289,7 @@@ CONFIG_NET=
  #
  # Networking options
  #
+ CONFIG_COMPAT_NET_DEV_OPS=y
  CONFIG_PACKET=y
  # CONFIG_PACKET_MMAP is not set
  CONFIG_UNIX=y
@@@ -355,6 -363,7 +363,7 @@@ CONFIG_IPV6_NDISC_NODETYPE=
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
  # CONFIG_NET_SCHED is not set
+ # CONFIG_DCB is not set
  
  #
  # Network testing
@@@ -370,8 -379,9 +379,9 @@@ CONFIG_WIRELESS=
  # CONFIG_CFG80211 is not set
  CONFIG_WIRELESS_OLD_REGULATORY=y
  # CONFIG_WIRELESS_EXT is not set
+ # CONFIG_LIB80211 is not set
  # CONFIG_MAC80211 is not set
- # CONFIG_IEEE80211 is not set
+ # CONFIG_WIMAX is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@@ -397,6 -407,7 +407,7 @@@ CONFIG_MTD=
  # CONFIG_MTD_DEBUG is not set
  # CONFIG_MTD_CONCAT is not set
  CONFIG_MTD_PARTITIONS=y
+ # CONFIG_MTD_TESTS is not set
  # CONFIG_MTD_REDBOOT_PARTS is not set
  CONFIG_MTD_CMDLINE_PARTS=y
  CONFIG_MTD_OF_PARTS=y
@@@ -468,6 -479,12 +479,12 @@@ CONFIG_MTD_PHYSMAP_OF=
  # CONFIG_MTD_NAND is not set
  # CONFIG_MTD_ONENAND is not set
  
+ #
+ # LPDDR flash memory drivers
+ #
+ # CONFIG_MTD_LPDDR is not set
+ # CONFIG_MTD_QINFO_PROBE is not set
+ 
  #
  # UBI - Unsorted block images
  #
@@@ -593,6 -610,7 +610,7 @@@ CONFIG_NETDEV_1000=
  # CONFIG_JME is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
+ CONFIG_CHELSIO_T3_DEPENDS=y
  # CONFIG_CHELSIO_T3 is not set
  # CONFIG_ENIC is not set
  # CONFIG_IXGBE is not set
@@@ -615,6 -633,10 +633,10 @@@
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  # CONFIG_IWLWIFI_LEDS is not set
+ 
+ #
+ # Enable WiMAX (Networking options) to see the WiMAX drivers
+ #
  # CONFIG_WAN is not set
  # CONFIG_FDDI is not set
  # CONFIG_HIPPI is not set
@@@ -674,9 -696,12 +696,12 @@@ CONFIG_SERIAL_CORE=
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_JSM is not set
  CONFIG_SERIAL_OF_PLATFORM=y
+ # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
  CONFIG_UNIX98_PTYS=y
+ # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_HVC_UDBG is not set
  # CONFIG_IPMI_HANDLER is not set
  # CONFIG_HW_RANDOM is not set
  # CONFIG_NVRAM is not set
@@@ -745,13 -770,12 +770,12 @@@ CONFIG_I2C_IBM_IIC=
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
 -# CONFIG_AT24 is not set
 -# CONFIG_SENSORS_EEPROM is not set
 +# CONFIG_EEPROM_AT24 is not set
 +# CONFIG_EEPROM_LEGACY 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_TPS65010 is not set
  # CONFIG_SENSORS_MAX6875 is not set
  # CONFIG_SENSORS_TSL2550 is not set
  # CONFIG_I2C_DEBUG_CORE is not set
@@@ -803,9 -827,11 +827,11 @@@ CONFIG_SSB_POSSIBLE=
  # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+ # CONFIG_TPS65010 is not set
  # CONFIG_MFD_TMIO is not set
  # CONFIG_MFD_WM8400 is not set
  # CONFIG_MFD_WM8350_I2C is not set
+ # CONFIG_MFD_PCF50633 is not set
  # CONFIG_REGULATOR is not set
  
  #
@@@ -904,9 -930,13 +930,13 @@@ CONFIG_USB_ARCH_HAS_EHCI=
  #
  
  #
- # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+ # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  #
  # CONFIG_USB_GADGET is not set
+ 
+ #
+ # OTG and related infrastructure
+ #
  # CONFIG_UWB is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@@ -918,7 -948,6 +948,6 @@@
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
  # CONFIG_STAGING is not set
- CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # File systems
@@@ -939,7 -968,9 +968,9 @@@ CONFIG_FS_MBCACHE=
  # CONFIG_FS_POSIX_ACL is not set
  CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
+ # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
+ # CONFIG_BTRFS_FS is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@@ -976,10 -1007,7 +1007,7 @@@ CONFIG_TMPFS=
  # CONFIG_TMPFS_POSIX_ACL is not set
  # CONFIG_HUGETLB_PAGE is not set
  # CONFIG_CONFIGFS_FS is not set
- 
- #
- # Miscellaneous filesystems
- #
+ CONFIG_MISC_FILESYSTEMS=y
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  # CONFIG_HFS_FS is not set
@@@ -1005,6 -1033,7 +1033,7 @@@ CONFIG_UBIFS_FS_LZO=
  CONFIG_UBIFS_FS_ZLIB=y
  # CONFIG_UBIFS_FS_DEBUG is not set
  CONFIG_CRAMFS=y
+ # CONFIG_SQUASHFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
  # CONFIG_OMFS_FS is not set
@@@ -1084,6 -1113,7 +1113,7 @@@ CONFIG_NLS_ISO8859_1=
  # Library routines
  #
  CONFIG_BITREVERSE=y
+ CONFIG_GENERIC_FIND_LAST_BIT=y
  # CONFIG_CRC_CCITT is not set
  CONFIG_CRC16=m
  # CONFIG_CRC_T10DIF is not set
@@@ -1137,6 -1167,7 +1167,7 @@@ CONFIG_DEBUG_BUGVERBOSE=
  # CONFIG_DEBUG_MEMORY_INIT is not set
  # CONFIG_DEBUG_LIST is not set
  # CONFIG_DEBUG_SG is not set
+ # CONFIG_DEBUG_NOTIFIERS is not set
  # CONFIG_BOOT_PRINTK_DELAY is not set
  # CONFIG_RCU_TORTURE_TEST is not set
  # CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@@ -1146,6 -1177,8 +1177,8 @@@
  # CONFIG_LATENCYTOP is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_HAVE_FUNCTION_TRACER=y
+ CONFIG_HAVE_DYNAMIC_FTRACE=y
+ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
  
  #
  # Tracers
@@@ -1154,11 -1187,13 +1187,13 @@@
  # CONFIG_SCHED_TRACER is not set
  # CONFIG_CONTEXT_SWITCH_TRACER is not set
  # CONFIG_BOOT_TRACER is not set
+ # CONFIG_TRACE_BRANCH_PROFILING is not set
  # CONFIG_STACK_TRACER is not set
  # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_HAVE_ARCH_KGDB=y
  # CONFIG_KGDB is not set
+ CONFIG_PRINT_STACK_DEPTH=64
  # CONFIG_DEBUG_STACKOVERFLOW is not set
  # CONFIG_DEBUG_STACK_USAGE is not set
  # CONFIG_DEBUG_PAGEALLOC is not set
@@@ -1185,11 -1220,15 +1220,15 @@@ CONFIG_CRYPTO=
  #
  # CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=y
+ CONFIG_CRYPTO_ALGAPI2=y
+ CONFIG_CRYPTO_AEAD2=y
  CONFIG_CRYPTO_BLKCIPHER=y
+ CONFIG_CRYPTO_BLKCIPHER2=y
  CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_RNG=y
+ CONFIG_CRYPTO_HASH2=y
+ CONFIG_CRYPTO_RNG2=y
  CONFIG_CRYPTO_MANAGER=y
+ CONFIG_CRYPTO_MANAGER2=y
  # CONFIG_CRYPTO_GF128MUL is not set
  # CONFIG_CRYPTO_NULL is not set
  # CONFIG_CRYPTO_CRYPTD is not set

diff --combined arch/powerpc/configs/ppc44x_defconfig
index 358b85f9270e6d4732d5c1cc6ed7f87af93e43ea,e6d252237a9711ae4939bfb3d9b467a98ba86b25..5e6d55f006bb511d6b9b4caa00937fc8ad9504c6
--- 1/arch/powerpc/configs/ppc44x_defconfig
--- 2/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.28-rc4
- # Fri Nov 14 10:06:19 2008
+ # Linux kernel version: 2.6.29-rc2
+ # Fri Jan 23 08:43:46 2009
  #
  # CONFIG_PPC64 is not set
  
@@@ -19,6 -19,7 +19,7 @@@ CONFIG_4xx=
  CONFIG_BOOKE=y
  CONFIG_PTE_64BIT=y
  CONFIG_PHYS_64BIT=y
+ CONFIG_PPC_MMU_NOHASH=y
  # CONFIG_PPC_MM_SLICES is not set
  CONFIG_NOT_COHERENT_CACHE=y
  CONFIG_PPC32=y
@@@ -45,7 -46,7 +46,7 @@@ CONFIG_GENERIC_GPIO=
  CONFIG_PPC=y
  CONFIG_EARLY_PRINTK=y
  CONFIG_GENERIC_NVRAM=y
- CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+ CONFIG_SCHED_OMIT_FRAME_POINTER=y
  CONFIG_ARCH_MAY_HAVE_PC_FDC=y
  CONFIG_PPC_OF=y
  CONFIG_OF=y
@@@ -76,12 -77,12 +77,12 @@@ CONFIG_POSIX_MQUEUE=
  # CONFIG_AUDIT is not set
  # CONFIG_IKCONFIG is not set
  CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
  CONFIG_GROUP_SCHED=y
  CONFIG_FAIR_GROUP_SCHED=y
  # CONFIG_RT_GROUP_SCHED is not set
  CONFIG_USER_SCHED=y
  # CONFIG_CGROUP_SCHED is not set
+ # CONFIG_CGROUPS is not set
  CONFIG_SYSFS_DEPRECATED=y
  CONFIG_SYSFS_DEPRECATED_V2=y
  # CONFIG_RELAY is not set
@@@ -94,6 -95,7 +95,7 @@@ CONFIG_EMBEDDED=
  CONFIG_SYSCTL_SYSCALL=y
  CONFIG_KALLSYMS=y
  CONFIG_KALLSYMS_ALL=y
+ CONFIG_KALLSYMS_STRIP_GENERATED=y
  CONFIG_KALLSYMS_EXTRA_PASS=y
  CONFIG_HOTPLUG=y
  CONFIG_PRINTK=y
@@@ -116,7 -118,6 +118,6 @@@ CONFIG_SLUB_DEBUG=
  CONFIG_SLUB=y
  # CONFIG_SLOB is not set
  # CONFIG_PROFILING is not set
- # CONFIG_MARKERS is not set
  CONFIG_HAVE_OPROFILE=y
  # CONFIG_KPROBES is not set
  CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@@ -127,7 -128,6 +128,6 @@@ CONFIG_HAVE_ARCH_TRACEHOOK=
  # 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
@@@ -135,11 -135,9 +135,9 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
- CONFIG_KMOD=y
  CONFIG_BLOCK=y
  CONFIG_LBD=y
  # CONFIG_BLK_DEV_IO_TRACE is not set
- # CONFIG_LSF is not set
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_BLK_DEV_INTEGRITY is not set
  
@@@ -157,6 -155,10 +155,10 @@@ CONFIG_DEFAULT_AS=
  CONFIG_DEFAULT_IOSCHED="anticipatory"
  CONFIG_PREEMPT_NOTIFIERS=y
  CONFIG_CLASSIC_RCU=y
+ # CONFIG_TREE_RCU is not set
+ # CONFIG_PREEMPT_RCU is not set
+ # CONFIG_TREE_RCU_TRACE is not set
+ # CONFIG_PREEMPT_RCU_TRACE is not set
  # CONFIG_FREEZER is not set
  CONFIG_PPC4xx_PCI_EXPRESS=y
  
@@@ -204,6 -206,7 +206,7 @@@ CONFIG_XILINX_VIRTEX_5_FXT=
  # CONFIG_CPU_FREQ is not set
  # CONFIG_FSL_ULI1575 is not set
  CONFIG_OF_RTC=y
+ # CONFIG_SIMPLE_GPIO is not set
  
  #
  # Kernel options
@@@ -227,6 -230,7 +230,7 @@@ CONFIG_BINFMT_ELF=
  # CONFIG_BINFMT_MISC is not set
  CONFIG_MATH_EMULATION=y
  # CONFIG_IOMMU_HELPER is not set
+ CONFIG_PPC_NEED_DMA_SYNC_OPS=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
  CONFIG_ARCH_HAS_WALK_MEMORY=y
  CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@@ -241,12 -245,14 +245,14 @@@ CONFIG_FLAT_NODE_MEM_MAP=
  CONFIG_PAGEFLAGS_EXTENDED=y
  CONFIG_SPLIT_PTLOCK_CPUS=4
  CONFIG_MIGRATION=y
- CONFIG_RESOURCES_64BIT=y
  CONFIG_PHYS_ADDR_T_64BIT=y
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
  CONFIG_UNEVICTABLE_LRU=y
+ CONFIG_PPC_4K_PAGES=y
+ # CONFIG_PPC_16K_PAGES is not set
+ # CONFIG_PPC_64K_PAGES is not set
  CONFIG_FORCE_MAX_ZONEORDER=11
  CONFIG_PROC_DEVICETREE=y
  # CONFIG_CMDLINE_BOOL is not set
@@@ -269,6 -275,7 +275,7 @@@ CONFIG_ARCH_SUPPORTS_MSI=
  # CONFIG_PCI_MSI is not set
  # CONFIG_PCI_LEGACY is not set
  # CONFIG_PCI_DEBUG is not set
+ # CONFIG_PCI_STUB is not set
  # CONFIG_PCCARD is not set
  # CONFIG_HOTPLUG_PCI is not set
  # CONFIG_HAS_RAPIDIO is not set
@@@ -293,6 -300,7 +300,7 @@@ CONFIG_NET=
  #
  # Networking options
  #
+ CONFIG_COMPAT_NET_DEV_OPS=y
  CONFIG_PACKET=y
  # CONFIG_PACKET_MMAP is not set
  CONFIG_UNIX=y
@@@ -354,10 -362,12 +362,12 @@@ CONFIG_IPV6_NDISC_NODETYPE=
  # CONFIG_IP_SCTP is not set
  # CONFIG_TIPC is not set
  # CONFIG_ATM is not set
+ CONFIG_STP=m
  CONFIG_BRIDGE=m
  # CONFIG_NET_DSA is not set
  # CONFIG_VLAN_8021Q is not set
  # CONFIG_DECNET is not set
+ CONFIG_LLC=m
  # CONFIG_LLC2 is not set
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
@@@ -366,6 -376,7 +376,7 @@@
  # CONFIG_ECONET is not set
  # CONFIG_WAN_ROUTER is not set
  # CONFIG_NET_SCHED is not set
+ # CONFIG_DCB is not set
  
  #
  # Network testing
@@@ -378,6 -389,7 +389,7 @@@
  # CONFIG_AF_RXRPC is not set
  # CONFIG_PHONET is not set
  # CONFIG_WIRELESS is not set
+ # CONFIG_WIMAX is not set
  # CONFIG_RFKILL is not set
  # CONFIG_NET_9P is not set
  
@@@ -403,6 -415,7 +415,7 @@@ CONFIG_MTD=
  # CONFIG_MTD_DEBUG is not set
  # CONFIG_MTD_CONCAT is not set
  CONFIG_MTD_PARTITIONS=y
+ # CONFIG_MTD_TESTS is not set
  # CONFIG_MTD_REDBOOT_PARTS is not set
  # CONFIG_MTD_CMDLINE_PARTS is not set
  CONFIG_MTD_OF_PARTS=y
@@@ -473,6 -486,12 +486,12 @@@ CONFIG_MTD_PHYSMAP_OF=
  # CONFIG_MTD_NAND is not set
  # CONFIG_MTD_ONENAND is not set
  
+ #
+ # LPDDR flash memory drivers
+ #
+ # CONFIG_MTD_LPDDR is not set
+ # CONFIG_MTD_QINFO_PROBE is not set
+ 
  #
  # UBI - Unsorted block images
  #
@@@ -631,6 -650,7 +650,7 @@@ CONFIG_NETDEV_1000=
  # CONFIG_JME is not set
  CONFIG_NETDEV_10000=y
  # CONFIG_CHELSIO_T1 is not set
+ CONFIG_CHELSIO_T3_DEPENDS=y
  # CONFIG_CHELSIO_T3 is not set
  # CONFIG_ENIC is not set
  # CONFIG_IXGBE is not set
@@@ -654,6 -674,10 +674,10 @@@
  # CONFIG_WLAN_80211 is not set
  # CONFIG_IWLWIFI_LEDS is not set
  
+ #
+ # Enable WiMAX (Networking options) to see the WiMAX drivers
+ #
+ 
  #
  # USB Network Adapters
  #
@@@ -722,9 -746,12 +746,12 @@@ CONFIG_SERIAL_CORE=
  CONFIG_SERIAL_CORE_CONSOLE=y
  # CONFIG_SERIAL_JSM is not set
  CONFIG_SERIAL_OF_PLATFORM=y
+ # CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
  CONFIG_UNIX98_PTYS=y
+ # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
  CONFIG_LEGACY_PTYS=y
  CONFIG_LEGACY_PTY_COUNT=256
+ # CONFIG_HVC_UDBG is not set
  # CONFIG_IPMI_HANDLER is not set
  # CONFIG_HW_RANDOM is not set
  # CONFIG_NVRAM is not set
@@@ -794,13 -821,12 +821,12 @@@ CONFIG_I2C_IBM_IIC=
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
 -# CONFIG_AT24 is not set
 -# CONFIG_SENSORS_EEPROM is not set
 +# CONFIG_EEPROM_AT24 is not set
 +# CONFIG_EEPROM_LEGACY 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_TPS65010 is not set
  # CONFIG_SENSORS_MAX6875 is not set
  # CONFIG_SENSORS_TSL2550 is not set
  # CONFIG_I2C_DEBUG_CORE is not set
@@@ -853,9 -879,11 +879,11 @@@ CONFIG_SSB_POSSIBLE=
  # CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
  # CONFIG_HTC_PASIC3 is not set
+ # CONFIG_TPS65010 is not set
  # CONFIG_MFD_TMIO is not set
  # CONFIG_MFD_WM8400 is not set
  # CONFIG_MFD_WM8350_I2C is not set
+ # CONFIG_MFD_PCF50633 is not set
  # CONFIG_REGULATOR is not set
  
  #
@@@ -972,6 -1000,7 +1000,7 @@@ CONFIG_USB_EHCI_HCD=
  CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
  CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
  CONFIG_USB_EHCI_HCD_PPC_OF=y
+ # CONFIG_USB_OXU210HP_HCD is not set
  # CONFIG_USB_ISP116X_HCD is not set
  # CONFIG_USB_ISP1760_HCD is not set
  CONFIG_USB_OHCI_HCD=m
@@@ -1012,7 -1041,6 +1041,6 @@@ CONFIG_USB_STORAGE=
  # CONFIG_USB_STORAGE_DATAFAB is not set
  # CONFIG_USB_STORAGE_FREECOM is not set
  # CONFIG_USB_STORAGE_ISD200 is not set
- # CONFIG_USB_STORAGE_DPCM is not set
  # CONFIG_USB_STORAGE_USBAT is not set
  # CONFIG_USB_STORAGE_SDDR09 is not set
  # CONFIG_USB_STORAGE_SDDR55 is not set
@@@ -1058,6 -1086,11 +1086,11 @@@
  # CONFIG_USB_ISIGHTFW is not set
  # CONFIG_USB_VST is not set
  # CONFIG_USB_GADGET is not set
+ 
+ #
+ # OTG and related infrastructure
+ #
+ # CONFIG_USB_GPIO_VBUS is not set
  # CONFIG_UWB is not set
  # CONFIG_MMC is not set
  # CONFIG_MEMSTICK is not set
@@@ -1069,7 -1102,6 +1102,6 @@@
  # CONFIG_DMADEVICES is not set
  # CONFIG_UIO is not set
  # CONFIG_STAGING is not set
- CONFIG_STAGING_EXCLUDE_BUILD=y
  
  #
  # File systems
@@@ -1089,7 -1121,9 +1121,9 @@@ CONFIG_FS_MBCACHE=
  # CONFIG_FS_POSIX_ACL is not set
  CONFIG_FILE_LOCKING=y
  # CONFIG_XFS_FS is not set
+ # CONFIG_GFS2_FS is not set
  # CONFIG_OCFS2_FS is not set
+ # CONFIG_BTRFS_FS is not set
  CONFIG_DNOTIFY=y
  CONFIG_INOTIFY=y
  CONFIG_INOTIFY_USER=y
@@@ -1126,10 -1160,7 +1160,7 @@@ CONFIG_TMPFS=
  # CONFIG_TMPFS_POSIX_ACL is not set
  # CONFIG_HUGETLB_PAGE is not set
  # CONFIG_CONFIGFS_FS is not set
- 
- #
- # Miscellaneous filesystems
- #
+ CONFIG_MISC_FILESYSTEMS=y
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  # CONFIG_HFS_FS is not set
@@@ -1155,6 -1186,7 +1186,7 @@@ CONFIG_UBIFS_FS_LZO=
  CONFIG_UBIFS_FS_ZLIB=y
  # CONFIG_UBIFS_FS_DEBUG is not set
  CONFIG_CRAMFS=y
+ # CONFIG_SQUASHFS is not set
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
  # CONFIG_OMFS_FS is not set
@@@ -1234,6 -1266,7 +1266,7 @@@ CONFIG_NLS_ISO8859_1=
  # Library routines
  #
  CONFIG_BITREVERSE=y
+ CONFIG_GENERIC_FIND_LAST_BIT=y
  # CONFIG_CRC_CCITT is not set
  CONFIG_CRC16=m
  CONFIG_CRC_T10DIF=m
@@@ -1287,6 -1320,7 +1320,7 @@@ CONFIG_DEBUG_BUGVERBOSE=
  # CONFIG_DEBUG_MEMORY_INIT is not set
  # CONFIG_DEBUG_LIST is not set
  # CONFIG_DEBUG_SG is not set
+ # CONFIG_DEBUG_NOTIFIERS is not set
  # CONFIG_BOOT_PRINTK_DELAY is not set
  # CONFIG_RCU_TORTURE_TEST is not set
  # CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@@ -1296,6 -1330,8 +1330,8 @@@
  # CONFIG_LATENCYTOP is not set
  CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_HAVE_FUNCTION_TRACER=y
+ CONFIG_HAVE_DYNAMIC_FTRACE=y
+ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
  
  #
  # Tracers
@@@ -1304,11 -1340,13 +1340,13 @@@
  # CONFIG_SCHED_TRACER is not set
  # CONFIG_CONTEXT_SWITCH_TRACER is not set
  # CONFIG_BOOT_TRACER is not set
+ # CONFIG_TRACE_BRANCH_PROFILING is not set
  # CONFIG_STACK_TRACER is not set
  # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  # CONFIG_SAMPLES is not set
  CONFIG_HAVE_ARCH_KGDB=y
  # CONFIG_KGDB is not set
+ CONFIG_PRINT_STACK_DEPTH=64
  # CONFIG_DEBUG_STACKOVERFLOW is not set
  # CONFIG_DEBUG_STACK_USAGE is not set
  # CONFIG_DEBUG_PAGEALLOC is not set
@@@ -1333,11 -1371,15 +1371,15 @@@ CONFIG_CRYPTO=
  #
  # CONFIG_CRYPTO_FIPS is not set
  CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=y
+ CONFIG_CRYPTO_ALGAPI2=y
+ CONFIG_CRYPTO_AEAD2=y
  CONFIG_CRYPTO_BLKCIPHER=y
+ CONFIG_CRYPTO_BLKCIPHER2=y
  CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_RNG=y
+ CONFIG_CRYPTO_HASH2=y
+ CONFIG_CRYPTO_RNG2=y
  CONFIG_CRYPTO_MANAGER=y
+ CONFIG_CRYPTO_MANAGER2=y
  # CONFIG_CRYPTO_GF128MUL is not set
  # CONFIG_CRYPTO_NULL is not set
  # CONFIG_CRYPTO_CRYPTD is not set
@@@ -1419,5 -1461,6 +1461,6 @@@ CONFIG_CRYPTO_LZO=
  CONFIG_VIRTUALIZATION=y
  CONFIG_KVM=y
  CONFIG_KVM_440=y
+ # CONFIG_KVM_EXIT_TIMING is not set
  # CONFIG_VIRTIO_PCI is not set
  # CONFIG_VIRTIO_BALLOON is not set