diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-01-18 18:46:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-18 18:46:10 -0800 |
| commit | deec0d2278d8da61872c5686a89689ff3b7715ad (patch) | |
| tree | 562755c7b1d0ee4a297d6205dfe5a3180266386b | |
| parent | 7d8f7295f89c6a1dfc9357167098f00846ca50ef (diff) | |
[PATCH] sn: Fix the last patch - missed an IS_PIC_SOFT and needed the CG definition
From: Pat Gefre <pfg@sgi.com>
Fix the last patch - missed an IS_PIC_SOFT and needed the CG definition
| -rw-r--r-- | include/asm-ia64/sn/ksys/l1.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/sn/pci/bridge.h | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/asm-ia64/sn/ksys/l1.h b/include/asm-ia64/sn/ksys/l1.h index 0192cb3071d3..680adf040186 100644 --- a/include/asm-ia64/sn/ksys/l1.h +++ b/include/asm-ia64/sn/ksys/l1.h @@ -90,6 +90,7 @@ #define L1_BRICKTYPE_IP45 0x34 /* 4 */ #define L1_BRICKTYPE_C 0x43 /* C */ #define L1_BRICKTYPE_R 0x52 /* R */ +#define L1_BRICKTYPE_CHI_CG 0x76 /* v */ #define L1_BRICKTYPE_N 0x4e /* N */ #define L1_BRICKTYPE_PX 0x23 /* # */ #define L1_BRICKTYPE_IX 0x3d /* = */ diff --git a/include/asm-ia64/sn/pci/bridge.h b/include/asm-ia64/sn/pci/bridge.h index 11c4a2e3d8af..a527b4a9b2f6 100644 --- a/include/asm-ia64/sn/pci/bridge.h +++ b/include/asm-ia64/sn/pci/bridge.h @@ -916,12 +916,8 @@ typedef volatile struct bridge_s { #define PCIBR_TYPE1_CFG(ps) PCIBRIDGE_TYPE1_CFG((ps)->bs_busnum) #define PCIBR_BUS_TYPE0_CFG_DEV0(ps) PCIBR_TYPE0_CFG_DEV(ps, 0) -#define PCIBR_TYPE0_CFG_DEV(ps, s) \ - ((IS_PIC_SOFT(ps)) ? PCIBRIDGE_TYPE0_CFG_DEV((ps)->bs_busnum, s+1) : \ - PCIBRIDGE_TYPE0_CFG_DEV((ps)->bs_busnum, s)) -#define PCIBR_BUS_TYPE0_CFG_DEVF(ps,s,f) \ - ((IS_PIC_SOFT(ps)) ? PCIBRIDGE_TYPE0_CFG_DEVF((ps)->bs_busnum,(s+1),f) : \ - PCIBRIDGE_TYPE0_CFG_DEVF((ps)->bs_busnum,s,f)) +#define PCIBR_TYPE0_CFG_DEV(ps, s) PCIBRIDGE_TYPE0_CFG_DEV((ps)->bs_busnum, s+1) +#define PCIBR_BUS_TYPE0_CFG_DEVF(ps,s,f) PCIBRIDGE_TYPE0_CFG_DEVF((ps)->bs_busnum,(s+1),f) #endif /* LANGUAGE_C */ |