diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-06 11:16:34 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-06 11:16:34 +0400 |
| commit | 257dab81413b31b8648becfe11586b3a41e5c29a (patch) | |
| tree | 6f407983f0a37dd250d0014b990bbf118df57e34 /arch/arm/mach-pxa/include/mach/regs-u2d.h | |
| parent | ea056df7965fc46cfff28fd3808bf3ada23d5059 (diff) | |
| parent | ccb8d8d070b8f25f0163da5c9ceacf63a5169540 (diff) | |
| download | linux-257dab81413b31b8648becfe11586b3a41e5c29a.tar.xz | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/regs-u2d.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/regs-u2d.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/regs-u2d.h b/arch/arm/mach-pxa/include/mach/regs-u2d.h index 44b0b20b69a4..c15c0c57de08 100644 --- a/arch/arm/mach-pxa/include/mach/regs-u2d.h +++ b/arch/arm/mach-pxa/include/mach/regs-u2d.h @@ -166,7 +166,8 @@ #define U2DMACSR_BUSERRTYPE (7 << 10) /* PX Bus Error Type */ #define U2DMACSR_EORINTR (1 << 9) /* End Of Receive */ #define U2DMACSR_REQPEND (1 << 8) /* Request Pending */ -#define U2DMACSR_RASINTR (1 << 4) /* Request After Channel Stopped (read / write 1 clear) */#define U2DMACSR_STOPINTR (1 << 3) /* Stop Interrupt (read only) */ +#define U2DMACSR_RASINTR (1 << 4) /* Request After Channel Stopped (read / write 1 clear) */ +#define U2DMACSR_STOPINTR (1 << 3) /* Stop Interrupt (read only) */ #define U2DMACSR_ENDINTR (1 << 2) /* End Interrupt (read / write 1 clear) */ #define U2DMACSR_STARTINTR (1 << 1) /* Start Interrupt (read / write 1 clear) */ #define U2DMACSR_BUSERRINTR (1 << 0) /* Bus Error Interrupt (read / write 1 clear) */ |