diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /arch/powerpc/include/asm/mpic.h | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'arch/powerpc/include/asm/mpic.h')
| -rw-r--r-- | arch/powerpc/include/asm/mpic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index 34d9ac433ace..c2ccca53b991 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h | |||
| @@ -355,6 +355,8 @@ struct mpic | |||
| 355 | #define MPIC_NO_BIAS 0x00000400 | 355 | #define MPIC_NO_BIAS 0x00000400 |
| 356 | /* Ignore NIRQS as reported by FRR */ | 356 | /* Ignore NIRQS as reported by FRR */ |
| 357 | #define MPIC_BROKEN_FRR_NIRQS 0x00000800 | 357 | #define MPIC_BROKEN_FRR_NIRQS 0x00000800 |
| 358 | /* Destination only supports a single CPU at a time */ | ||
| 359 | #define MPIC_SINGLE_DEST_CPU 0x00001000 | ||
| 358 | 360 | ||
| 359 | /* MPIC HW modification ID */ | 361 | /* MPIC HW modification ID */ |
| 360 | #define MPIC_REGSET_MASK 0xf0000000 | 362 | #define MPIC_REGSET_MASK 0xf0000000 |