diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
| commit | f39d01be4c59a61a08d0cb53f615e7016b85d339 (patch) | |
| tree | 6777590e3ff2ddf4df1d38444ba7d692cd463b7b /arch/mips/sibyte | |
| parent | 54291263519ac2c9bdda68b23b02fef3808deed4 (diff) | |
| parent | 7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
vlynq: make whole Kconfig-menu dependant on architecture
add descriptive comment for TIF_MEMDIE task flag declaration.
EEPROM: max6875: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: Header file cleanup
agp: use NULL instead of 0 when pointer is needed
rtc-v3020: make bitfield unsigned
PCI: make bitfield unsigned
jbd2: use NULL instead of 0 when pointer is needed
cciss: fix shadows sparse warning
doc: inode uses a mutex instead of a semaphore.
uml: i386: Avoid redefinition of NR_syscalls
fix "seperate" typos in comments
cocbalt_lcdfb: correct sections
doc: Change urls for sparse
Powerpc: wii: Fix typo in comment
i2o: cleanup some exit paths
Documentation/: it's -> its where appropriate
UML: Fix compiler warning due to missing task_struct declaration
UML: add kernel.h include to signal.c
...
Diffstat (limited to 'arch/mips/sibyte')
| -rw-r--r-- | arch/mips/sibyte/bcm1480/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/sibyte/sb1250/irq.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c index 7a8b0a8b643a..044bbe462c2c 100644 --- a/arch/mips/sibyte/bcm1480/irq.c +++ b/arch/mips/sibyte/bcm1480/irq.c | |||
| @@ -253,7 +253,7 @@ void __init init_bcm1480_irqs(void) | |||
| 253 | * On the second cpu, everything is set to IP5, which is | 253 | * On the second cpu, everything is set to IP5, which is |
| 254 | * ignored, EXCEPT the mailbox interrupt. That one is | 254 | * ignored, EXCEPT the mailbox interrupt. That one is |
| 255 | * set to IP[2] so it is handled. This is needed so we | 255 | * set to IP[2] so it is handled. This is needed so we |
| 256 | * can do cross-cpu function calls, as requred by SMP | 256 | * can do cross-cpu function calls, as required by SMP |
| 257 | */ | 257 | */ |
| 258 | 258 | ||
| 259 | #define IMR_IP2_VAL K_BCM1480_INT_MAP_I0 | 259 | #define IMR_IP2_VAL K_BCM1480_INT_MAP_I0 |
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index 62371f772553..12ac04a658ee 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
| @@ -236,7 +236,7 @@ void __init init_sb1250_irqs(void) | |||
| 236 | * On the second cpu, everything is set to IP5, which is | 236 | * On the second cpu, everything is set to IP5, which is |
| 237 | * ignored, EXCEPT the mailbox interrupt. That one is | 237 | * ignored, EXCEPT the mailbox interrupt. That one is |
| 238 | * set to IP[2] so it is handled. This is needed so we | 238 | * set to IP[2] so it is handled. This is needed so we |
| 239 | * can do cross-cpu function calls, as requred by SMP | 239 | * can do cross-cpu function calls, as required by SMP |
| 240 | */ | 240 | */ |
| 241 | 241 | ||
| 242 | #define IMR_IP2_VAL K_INT_MAP_I0 | 242 | #define IMR_IP2_VAL K_INT_MAP_I0 |