Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f566b2b22d89c4785f25e6e4d60163b5ae6251f4
Commit:     f566b2b22d89c4785f25e6e4d60163b5ae6251f4
Parent:     8e140362f71ed801c69c5df63a68fc2cd07da3a9
Author:     Philipp Zabel <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 2 20:59:38 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Jan 2 23:42:03 2007 +0000

    [ARM] 4080/1: Fix for the SSCR0_SlotsPerFrm macro
    
    The SSCR0_SlotsPerFrm macro writes a 3-bit value to bits [2:0], while the 
correct location of FRDC in SSCR0 is at bits [26:24]. This patch adds the 
missing "<< 24".
    
    Signed-off-by: Philipp Zabel <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-pxa/pxa-regs.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-arm/arch-pxa/pxa-regs.h 
b/include/asm-arm/arch-pxa/pxa-regs.h
index 083e03c..f8f3450 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -1626,7 +1626,7 @@
 #define SSCR0_RIM      (1 << 22)       /* Receive FIFO overrrun interrupt mask 
*/
 #define SSCR0_TUM      (1 << 23)       /* Transmit FIFO underrun interrupt 
mask */
 #define SSCR0_FRDC     (0x07000000)    /* Frame rate divider control (mask) */
-#define SSCR0_SlotsPerFrm(x) ((x) - 1) /* Time slots per frame [1..8] */
+#define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24) /* Time slots per frame [1..8] 
*/
 #define SSCR0_ADC      (1 << 30)       /* Audio clock select */
 #define SSCR0_MOD      (1 << 31)       /* Mode (normal or network) */
 #endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to