aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-20 13:25:26 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-20 13:25:26 +0000
commit29681c73264b4529b3ac300111ce990f33ebd9fa (patch)
treef14b1ebda699d88669993deff2593bb3c4ce3387
parent7d2e8e5419982bdaa42b27374929fc740f12f741 (diff)
downloadupstream-29681c73264b4529b3ac300111ce990f33ebd9fa.tar.gz
upstream-29681c73264b4529b3ac300111ce990f33ebd9fa.tar.bz2
upstream-29681c73264b4529b3ac300111ce990f33ebd9fa.zip
[kernel/2.6.30] remove some annoying warnings and fix snd modules build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31365 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-2.6.30/033-linux_unused_variable.patch11
-rw-r--r--target/linux/generic/patches-2.6.30/034-ppc_unused_variables.patch20
-rw-r--r--target/linux/generic/patches-2.6.30/035-snd-build-fixes.patch11
3 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.30/033-linux_unused_variable.patch b/target/linux/generic/patches-2.6.30/033-linux_unused_variable.patch
new file mode 100644
index 0000000000..8d77b43929
--- /dev/null
+++ b/target/linux/generic/patches-2.6.30/033-linux_unused_variable.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/pagemap.h
++++ b/include/linux/pagemap.h
+@@ -422,7 +422,7 @@ static inline int fault_in_pages_writeab
+
+ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
+ {
+- volatile char c;
++ volatile char c __maybe_unused;
+ int ret;
+
+ if (unlikely(size == 0))
diff --git a/target/linux/generic/patches-2.6.30/034-ppc_unused_variables.patch b/target/linux/generic/patches-2.6.30/034-ppc_unused_variables.patch
new file mode 100644
index 0000000000..a21e289eb6
--- /dev/null
+++ b/target/linux/generic/patches-2.6.30/034-ppc_unused_variables.patch
@@ -0,0 +1,20 @@
+--- a/arch/powerpc/include/asm/pgtable-ppc64.h
++++ b/arch/powerpc/include/asm/pgtable-ppc64.h
+@@ -226,7 +226,7 @@ static inline int __ptep_test_and_clear_
+ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
+ pte_t *ptep)
+ {
+- unsigned long old;
++ unsigned long old __maybe_unused;
+
+ if ((pte_val(*ptep) & _PAGE_RW) == 0)
+ return;
+@@ -236,7 +236,7 @@ static inline void ptep_set_wrprotect(st
+ static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
+ unsigned long addr, pte_t *ptep)
+ {
+- unsigned long old;
++ unsigned long old __maybe_unused;
+
+ if ((pte_val(*ptep) & _PAGE_RW) == 0)
+ return;
diff --git a/target/linux/generic/patches-2.6.30/035-snd-build-fixes.patch b/target/linux/generic/patches-2.6.30/035-snd-build-fixes.patch
new file mode 100644
index 0000000000..6d033320cb
--- /dev/null
+++ b/target/linux/generic/patches-2.6.30/035-snd-build-fixes.patch
@@ -0,0 +1,11 @@
+--- a/include/sound/soc-dai.h
++++ b/include/sound/soc-dai.h
+@@ -223,7 +223,7 @@ struct snd_soc_dai {
+ union {
+ struct snd_soc_codec *codec;
+ struct snd_soc_platform *platform;
+- };
++ } parent;
+
+ struct list_head list;
+ };