1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-07 20:09:17 +00:00

linux 3.0: fix regression introduced in 3.0.11

Upstream has been notified, so hopefully 3.0.13 will have this fix included

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-11-30 10:06:56 +01:00
parent 4ce8fc5209
commit 63545554b6
2 changed files with 28 additions and 1 deletions
@@ -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
+2 -1
View 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 \
\