diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 09:49:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 09:49:24 -0800 |
| commit | a12e60621b553e32711f9ad653aad3c92881c400 (patch) | |
| tree | f5b13bddbfa0c98ae2af7fbe85fadef91201dbca /include | |
| parent | aa62a869454c5900687822ee117f2d3494e2ea62 (diff) | |
| parent | 553876c802249b21267b78a9b3857d1341a3df87 (diff) | |
| download | blackbird-op-linux-a12e60621b553e32711f9ad653aad3c92881c400.tar.gz blackbird-op-linux-a12e60621b553e32711f9ad653aad3c92881c400.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4694/1: IXP4xx: Update clockevent support for shutdown and resume
[ARM] 4710/1: Fix coprocessor 14 usage for debug messages via ICEDCC
[ARM] 4690/1: PXA: fix CKEN corruption in PXA27x AC97 cold reset code
[ARM] 4667/1: CM-X270 fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxa-regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h index 6b33df6f1995..1bd398da07da 100644 --- a/include/asm-arm/arch-pxa/pxa-regs.h +++ b/include/asm-arm/arch-pxa/pxa-regs.h @@ -1784,6 +1784,7 @@ #define CCCR_M_MASK 0x0060 /* Memory Frequency to Run Mode Frequency Multiplier */ #define CCCR_L_MASK 0x001f /* Crystal Frequency to Memory Frequency Multiplier */ +#define CKEN_AC97CONF (31) /* AC97 Controller Configuration */ #define CKEN_CAMERA (24) /* Camera Interface Clock Enable */ #define CKEN_SSP1 (23) /* SSP1 Unit Clock Enable */ #define CKEN_MEMC (22) /* Memory Controller Clock Enable */ |
