diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 17:50:07 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 17:50:07 -0800 |
commit | 5fa2e1591300267b1e082c693d0b4da8e4943551 (patch) | |
tree | f37a664a6cf23eda2441dea39a7e58de7b8965fe /arch/ppc/platforms/4xx | |
parent | f194d132e4971111f85c18c96067acffb13cee6d (diff) | |
parent | 7cc955c8fdd58c5f2c98077011a20ce10897288c (diff) |
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] virtex bug fix: Use canonical value for AC97 interrupt xparams
[POWERPC] Update defconfigs
[POWERPC] PS3: Update ps3_defconfig
[POWERPC] Update iseries_defconfig
[POWERPC] Fix hardware IRQ time accounting problem.
Diffstat (limited to 'arch/ppc/platforms/4xx')
-rw-r--r-- | arch/ppc/platforms/4xx/xparameters/xparameters.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/ppc/platforms/4xx/xparameters/xparameters.h b/arch/ppc/platforms/4xx/xparameters/xparameters.h index 01aa043ff38..650888b00fb 100644 --- a/arch/ppc/platforms/4xx/xparameters/xparameters.h +++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h @@ -15,8 +15,16 @@ #if defined(CONFIG_XILINX_ML300) #include "xparameters_ml300.h" + #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_PLAYBACK_VEC_ID \ + XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR + #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_RECORD_VEC_ID \ + XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR #elif defined(CONFIG_XILINX_ML403) #include "xparameters_ml403.h" + #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_PLAYBACK_VEC_ID \ + XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR + #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_RECORD_VEC_ID \ + XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR #else /* Add other board xparameter includes here before the #else */ #error No xparameters_*.h file included |