git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
m68k
/
mac
/
iop.c
diff --git
a/arch/m68k/mac/iop.c
b/arch/m68k/mac/iop.c
index
9179a37
..
bc657b1
100644
(file)
--- a/
arch/m68k/mac/iop.c
+++ b/
arch/m68k/mac/iop.c
@@
-104,7
+104,6
@@
* should execute quickly.)
*/
* should execute quickly.)
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/mm.h>
@@
-317,7
+316,7
@@
void __init iop_register_interrupts(void)
{
if (iop_ism_present) {
if (oss_present) {
{
if (iop_ism_present) {
if (oss_present) {
-
cpu_
request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq,
+ request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq,
IRQ_FLG_LOCK, "ISM IOP",
(void *) IOP_NUM_ISM);
oss_irq_enable(IRQ_MAC_ADB);
IRQ_FLG_LOCK, "ISM IOP",
(void *) IOP_NUM_ISM);
oss_irq_enable(IRQ_MAC_ADB);