diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/ppc/platforms | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/ppc/platforms')
| -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 01aa043ff381..650888b00fb0 100644 --- a/arch/ppc/platforms/4xx/xparameters/xparameters.h +++ b/arch/ppc/platforms/4xx/xparameters/xparameters.h | |||
| @@ -15,8 +15,16 @@ | |||
| 15 | 15 | ||
| 16 | #if defined(CONFIG_XILINX_ML300) | 16 | #if defined(CONFIG_XILINX_ML300) |
| 17 | #include "xparameters_ml300.h" | 17 | #include "xparameters_ml300.h" |
| 18 | #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_PLAYBACK_VEC_ID \ | ||
| 19 | XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR | ||
| 20 | #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_RECORD_VEC_ID \ | ||
| 21 | XPAR_DCR_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR | ||
| 18 | #elif defined(CONFIG_XILINX_ML403) | 22 | #elif defined(CONFIG_XILINX_ML403) |
| 19 | #include "xparameters_ml403.h" | 23 | #include "xparameters_ml403.h" |
| 24 | #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_PLAYBACK_VEC_ID \ | ||
| 25 | XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_PLAYBACK_INTERRUPT_INTR | ||
| 26 | #define XPAR_INTC_0_AC97_CONTROLLER_REF_0_RECORD_VEC_ID \ | ||
| 27 | XPAR_OPB_INTC_0_OPB_AC97_CONTROLLER_REF_0_RECORD_INTERRUPT_INTR | ||
| 20 | #else | 28 | #else |
| 21 | /* Add other board xparameter includes here before the #else */ | 29 | /* Add other board xparameter includes here before the #else */ |
| 22 | #error No xparameters_*.h file included | 30 | #error No xparameters_*.h file included |