From 31170fdb8a0fca7e3a17fa93f976e5acc21e8e4b Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sat, 9 Jul 2011 23:17:59 +0200 Subject: [PATCH] --- yaml --- r: 258867 b: refs/heads/master c: 14559f2f9a8b7e5d565c7de34a95097ee331c5cb h: refs/heads/master i: 258865: c0804d0c6a401b92d84314f3b517df1c76c4eb94 258863: ae1d645182abce546dedf3a1f6a43fd47c4deeb8 v: v3 --- [refs] | 2 +- trunk/arch/xtensa/variants/s6000/include/variant/dmac.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1d51d7cee316..6ee173d35078 100644 --- 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 index 89ab9484fb71..e81735b2a206 100644 --- 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;