git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
cpm1.c
diff --git
a/arch/powerpc/sysdev/cpm1.c
b/arch/powerpc/sysdev/cpm1.c
index
0476bcc
..
e0bc944
100644
(file)
--- a/
arch/powerpc/sysdev/cpm1.c
+++ b/
arch/powerpc/sysdev/cpm1.c
@@
-103,8
+103,8
@@
static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
{
pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw);
{
pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw);
- irq_
to_desc(virq)->status |= IRQ_LEVEL
;
-
set_irq
_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
+ irq_
set_status_flags(virq, IRQ_LEVEL)
;
+
irq_set
_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
return 0;
}
return 0;
}
@@
-223,7
+223,7
@@
void __init cpm_reset(void)
/* Set SDMA Bus Request priority 5.
* On 860T, this also enables FEC priority 6. I am not sure
/* Set SDMA Bus Request priority 5.
* On 860T, this also enables FEC priority 6. I am not sure
- * this is what we realy want for some applications, but the
+ * this is what we real
l
y want for some applications, but the
* manual recommends it.
* Bit 25, FAM can also be set to use FEC aggressive mode (860T).
*/
* manual recommends it.
* Bit 25, FAM can also be set to use FEC aggressive mode (860T).
*/