---

yaml --- r: 258867 b: refs/heads/master c: 14559f2 h: refs/heads/master i: 258865: c0804d0 258863: ae1d645 v: v3
git-mirror · Jul 11, 2011 · 31170fd · 31170fd
1 parent eb80e16
commit 31170fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e04008eb38d8b0e3bca926c23cbea309edce164b
+refs/heads/master: 14559f2f9a8b7e5d565c7de34a95097ee331c5cb
diff --git a/trunk/arch/xtensa/variants/s6000/include/variant/dmac.h b/trunk/arch/xtensa/variants/s6000/include/variant/dmac.h
@@ -357,7 +357,7 @@ static inline u32 s6dmac_channel_enabled(u32 dmac, int chan)
 static inline void s6dmac_dp_setup_group(u32 dmac, int port,
 			int nrch, int frrep)
 {
-	const static u8 mask[4] = {0, 3, 1, 2};
+	static const u8 mask[4] = {0, 3, 1, 2};
 	BUG_ON(dmac != S6_REG_DPDMA);
 	if ((port < 0) || (port > 3) || (nrch < 1) || (nrch > 4))
 		return;