linux-omap4: sync with OE .dev

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

2 files changed, 36 insertions, 9 deletions

diff --git a/recipes-bsp/linux/linux-omap4/omap4430-panda/defconfig b/recipes-bsp/linux/linux-omap4/omap4430-panda/defconfig
index 041887ce5f..741db3382e 100644
--- a/recipes-bsp/linux/linux-omap4/omap4430-panda/defconfig
+++ b/recipes-bsp/linux/linux-omap4/omap4430-panda/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Wed Jan  5 11:21:06 2011
+# Sat May  7 15:52:24 2011
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -70,8 +70,24 @@ CONFIG_RCU_FANOUT=32
 # CONFIG_TREE_RCU_TRACE is not set
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
+CONFIG_LOG_BUF_SHIFT=16
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_NS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+CONFIG_DEBUG_BLK_CGROUP=y
+CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
@@ -152,6 +168,7 @@ CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
@@ -391,7 +408,7 @@ CONFIG_CPU_V7_SYSFS=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=" debug "
+CONFIG_CMDLINE=" debug"
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
@@ -788,6 +805,7 @@ CONFIG_NET_SCHED=y
 #
 # Classification
 #
+CONFIG_NET_CLS=y
 # CONFIG_NET_CLS_BASIC is not set
 # CONFIG_NET_CLS_TCINDEX is not set
 # CONFIG_NET_CLS_ROUTE4 is not set
@@ -797,6 +815,7 @@ CONFIG_NET_CLS_ROUTE=y
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_CLS_FLOW is not set
+CONFIG_NET_CLS_CGROUP=y
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_SCH_FIFO=y
@@ -1169,6 +1188,7 @@ CONFIG_WL1251_SDIO=m
 CONFIG_WL1271=m
 CONFIG_WL1271_SPI=m
 CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 
@@ -1561,6 +1581,7 @@ CONFIG_SENSORS_LM75=y
 # CONFIG_SENSORS_TMP102 is not set
 # CONFIG_SENSORS_TMP401 is not set
 # CONFIG_SENSORS_TMP421 is not set
+# CONFIG_SENSORS_TWL6030_HOTDIE is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_W83781D is not set
 # CONFIG_SENSORS_W83791D is not set
@@ -2436,7 +2457,7 @@ CONFIG_STAGING=y
 # CONFIG_VIDEO_TM6000 is not set
 # CONFIG_USB_IP_COMMON is not set
 # CONFIG_W35UND is not set
-# CONFIG_PRISM2_USB is not set
+CONFIG_PRISM2_USB=m
 # CONFIG_ECHO is not set
 # CONFIG_OTUS is not set
 # CONFIG_RT2870 is not set
@@ -2546,6 +2567,8 @@ CONFIG_AUFS_HFSNOTIFY=y
 CONFIG_AUFS_SP_IATTR=y
 # CONFIG_AUFS_SHWH is not set
 # CONFIG_AUFS_BR_RAMFS is not set
+CONFIG_AUFS_BR_FUSE=y
+CONFIG_AUFS_POLL=y
 CONFIG_AUFS_BDEV_LOOP=y
 # CONFIG_AUFS_DEBUG is not set
 
@@ -2554,7 +2577,7 @@ CONFIG_AUFS_BDEV_LOOP=y
 #
 CONFIG_BLK_DEV_COMPCACHE=m
 # CONFIG_BLK_DEV_COMPCACHE_DEBUG is not set
-# CONFIG_BLK_DEV_COMPCACHE_STATS is not set
+CONFIG_BLK_DEV_COMPCACHE_STATS=y
 CONFIG_SCSI_ISCSITARGET=m
 
 #
@@ -2591,8 +2614,9 @@ CONFIG_QUOTA_TREE=y
 CONFIG_QFMT_V2=y
 CONFIG_QUOTACTL=y
 # CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
 CONFIG_GENERIC_ACL=y
 
 #
@@ -2735,7 +2759,7 @@ CONFIG_NLS_ISO8859_1=y
 #
 # Kernel hacking
 #
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
diff --git a/recipes-bsp/linux/linux-omap4_2.6.35.3.bb b/recipes-bsp/linux/linux-omap4_2.6.35.3.bb
index bad586017e..9acdb49f5d 100644
--- a/recipes-bsp/linux/linux-omap4_2.6.35.3.bb
+++ b/recipes-bsp/linux/linux-omap4_2.6.35.3.bb
@@ -2,6 +2,9 @@ COMPATIBLE_MACHINE = "omap4430-panda"
 
 require linux.inc
 
+# The main PR is now using MACHINE_KERNEL_PR, for omap4 see conf/machine/include/omap4.inc
+MACHINE_KERNEL_PR_append = "b"
+
 CORTEXA8FIXUP = "no"
 
 SRCREV = "ti-ubuntu-2.6.35-980.1release13"