diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 14:58:23 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 14:58:23 +0100 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/asm-mips/pci/bridge.h | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
| download | kernel-crypto-ebf8889bd1fe3615991ff4494635d237280652a2.tar.gz kernel-crypto-ebf8889bd1fe3615991ff4494635d237280652a2.tar.xz kernel-crypto-ebf8889bd1fe3615991ff4494635d237280652a2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/pci/bridge.h')
| -rw-r--r-- | include/asm-mips/pci/bridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/pci/bridge.h b/include/asm-mips/pci/bridge.h index 0c45e7598f3..b84feebf2ce 100644 --- a/include/asm-mips/pci/bridge.h +++ b/include/asm-mips/pci/bridge.h @@ -360,7 +360,7 @@ typedef struct bridge_err_cmdword_s { #define BRIDGE_TYPE0_CFG_FUNC_OFF 0x00000100 /* Type 0 Cfg Func Offset (1..7) */ #define BRIDGE_TYPE0_CFG_DEV(s) (BRIDGE_TYPE0_CFG_DEV0+\ (s)*BRIDGE_TYPE0_CFG_SLOT_OFF) -#define BRIDGE_TYPE0_CFG_DEVF(s,f) (BRIDGE_TYPE0_CFG_DEV0+\ +#define BRIDGE_TYPE0_CFG_DEVF(s, f) (BRIDGE_TYPE0_CFG_DEV0+\ (s)*BRIDGE_TYPE0_CFG_SLOT_OFF+\ (f)*BRIDGE_TYPE0_CFG_FUNC_OFF) |