mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 01:51:53 +00:00
[ARM] 3434/1: pxa i2s amsl define
Patch from Marc-Andre Hebert The error concerns a bit mask define for the AMSL bit of the SACR1 register in the 2.6 kernel tree. The AMSL is bit 0 and it was defined as so in the 2.4 kernel tree but it is inccorrectly set as bit 1 (a reserved bit) in the 2.6 kernel tree. Signed-off-by: Marc-Andre Hebert <marcandreh@humanware.ca> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
b48340aff0
commit
fd88dd740a
@ -485,7 +485,7 @@
|
||||
#define SACR1_ENLBF (1 << 5) /* Enable Loopback */
|
||||
#define SACR1_DRPL (1 << 4) /* Disable Replaying Function */
|
||||
#define SACR1_DREC (1 << 3) /* Disable Recording Function */
|
||||
#define SACR1_AMSL (1 << 1) /* Specify Alternate Mode */
|
||||
#define SACR1_AMSL (1 << 0) /* Specify Alternate Mode */
|
||||
|
||||
#define SASR0_I2SOFF (1 << 7) /* Controller Status */
|
||||
#define SASR0_ROR (1 << 6) /* Rx FIFO Overrun */
|
||||
|
Loading…
Reference in New Issue
Block a user