Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial

[linux-2.6-omap-h63xx.git] / include / asm-sh / cpu-sh4 / dma.h

diff --git a/include/asm-sh/cpu-sh4/dma.h b/include/asm-sh/cpu-sh4/dma.h
index c135e9cebd9c0c9a74f0479c3e16c1cfd09c38e6..aaf71b018c281399ade954200171fc60400c8f33 100644 (file)
--- a/include/asm-sh/cpu-sh4/dma.h
+++ b/include/asm-sh/cpu-sh4/dma.h
@@ -31,7 +31,7 @@
 #define TS_32          0x00000030
 #define TS_64          0x00000000
 
-#define CHCR_TS_MASK   0x30
+#define CHCR_TS_MASK   0x70
 #define CHCR_TS_SHIFT  4
 
 #define DMAOR_COD      0x00000008
@@ -53,7 +53,7 @@ enum {
 /*
  * The DMA count is defined as the number of bytes to transfer.
  */
-static unsigned int ts_shift[] __attribute__ ((used)) = {
+static unsigned int ts_shift[] __maybe_unused = {
        [XMIT_SZ_64BIT]         = 3,
        [XMIT_SZ_8BIT]          = 0,
        [XMIT_SZ_16BIT]         = 1,