linux 3.0: fix regression introduced in 3.0.11
authorKoen Kooi <koen@dominion.thruhere.net>
Wed, 30 Nov 2011 09:06:56 +0000 (10:06 +0100)
committerKoen Kooi <koen@dominion.thruhere.net>
Wed, 30 Nov 2011 09:06:56 +0000 (10:06 +0100)
Upstream has been notified, so hopefully 3.0.13 will have this fix included

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
recipes-kernel/linux/linux-3.0/beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch [new file with mode: 0644]
recipes-kernel/linux/linux_3.0.bb

diff --git a/recipes-kernel/linux/linux-3.0/beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch b/recipes-kernel/linux/linux-3.0/beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch
new file mode 100644 (file)
index 0000000..527b0f5
--- /dev/null
@@ -0,0 +1,26 @@
+From 6d7bf5251219d2aa604ada2c955812b16ad5cff4 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Wed, 30 Nov 2011 09:50:56 +0100
+Subject: [PATCH] Revert "mfd: Fix twl4030 dependencies for audio codec"
+
+This reverts commit 11b8fc6ae54bf18a48c94e181c37ca135b858b42.
+---
+ drivers/mfd/twl-core.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
+index f0dfca3..e659d4e 100644
+--- a/drivers/mfd/twl-core.c
++++ b/drivers/mfd/twl-core.c
+@@ -116,7 +116,7 @@
+ #define twl_has_watchdog()        false
+ #endif
+-#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
++#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
+       defined(CONFIG_SND_SOC_TWL6040) || defined(CONFIG_SND_SOC_TWL6040_MODULE)
+ #define twl_has_codec()       true
+ #else
+-- 
+1.7.2.5
+
index 5039b2289f0f661ca38f6a0b6186e46b3a40c2f3..38b90e9fc8e9f4b6b47247fb677a2267419f575e 100644 (file)
@@ -10,7 +10,7 @@ PV = "3.0.12"
 SRCREV_pn-${PN} = "ac6766564c0305ca020fe747dfd7dbdf0881369d"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-MACHINE_KERNEL_PR_append = "a"
+MACHINE_KERNEL_PR_append = "b"
 
 FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:"
 
@@ -194,6 +194,7 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gi
             file://beagle/0008-OMAP2-add-cpu-id-register-to-MAC-address-helper.patch \
             file://beagle/0009-HACK-OMAP2-BeagleBoard-Fix-up-random-or-missing-MAC-.patch \
             file://beagle/0010-ARM-OMAP2-beagleboard-fix-mmc-write-protect-pin-when.patch \
+            file://beagle/0011-Revert-mfd-Fix-twl4030-dependencies-for-audio-codec.patch \
             file://madc/0001-Enabling-Hwmon-driver-for-twl4030-madc.patch \
             file://madc/0002-mfd-twl-core-enable-madc-clock.patch \
             \