diff options
Diffstat (limited to 'drivers/char/rio/riointr.c')
-rw-r--r-- | drivers/char/rio/riointr.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c index ec415ccbc4f0..97f0fa550652 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/char/rio/riointr.c | |||
@@ -54,15 +54,12 @@ static char *_riointr_c_sccs_ = "@(#)riointr.c 1.2"; | |||
54 | 54 | ||
55 | #include "linux_compat.h" | 55 | #include "linux_compat.h" |
56 | #include "rio_linux.h" | 56 | #include "rio_linux.h" |
57 | #include "typdef.h" | ||
58 | #include "pkt.h" | 57 | #include "pkt.h" |
59 | #include "daemon.h" | 58 | #include "daemon.h" |
60 | #include "rio.h" | 59 | #include "rio.h" |
61 | #include "riospace.h" | 60 | #include "riospace.h" |
62 | #include "top.h" | ||
63 | #include "cmdpkt.h" | 61 | #include "cmdpkt.h" |
64 | #include "map.h" | 62 | #include "map.h" |
65 | #include "riotypes.h" | ||
66 | #include "rup.h" | 63 | #include "rup.h" |
67 | #include "port.h" | 64 | #include "port.h" |
68 | #include "riodrvr.h" | 65 | #include "riodrvr.h" |
@@ -75,12 +72,10 @@ static char *_riointr_c_sccs_ = "@(#)riointr.c 1.2"; | |||
75 | #include "unixrup.h" | 72 | #include "unixrup.h" |
76 | #include "board.h" | 73 | #include "board.h" |
77 | #include "host.h" | 74 | #include "host.h" |
78 | #include "error.h" | ||
79 | #include "phb.h" | 75 | #include "phb.h" |
80 | #include "link.h" | 76 | #include "link.h" |
81 | #include "cmdblk.h" | 77 | #include "cmdblk.h" |
82 | #include "route.h" | 78 | #include "route.h" |
83 | #include "control.h" | ||
84 | #include "cirrus.h" | 79 | #include "cirrus.h" |
85 | #include "rioioctl.h" | 80 | #include "rioioctl.h" |
86 | 81 | ||
@@ -396,7 +391,6 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
396 | /* For now don't handle RTA reboots. -- REW. | 391 | /* For now don't handle RTA reboots. -- REW. |
397 | Reenabled. Otherwise RTA reboots didn't work. Duh. -- REW */ | 392 | Reenabled. Otherwise RTA reboots didn't work. Duh. -- REW */ |
398 | if (PortP->MagicFlags) { | 393 | if (PortP->MagicFlags) { |
399 | #if 1 | ||
400 | if (PortP->MagicFlags & MAGIC_REBOOT) { | 394 | if (PortP->MagicFlags & MAGIC_REBOOT) { |
401 | /* | 395 | /* |
402 | ** well, the RTA has been rebooted, and there is room | 396 | ** well, the RTA has been rebooted, and there is room |
@@ -413,13 +407,12 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
413 | PortP->InUse = NOT_INUSE; | 407 | PortP->InUse = NOT_INUSE; |
414 | 408 | ||
415 | rio_spin_unlock(&PortP->portSem); | 409 | rio_spin_unlock(&PortP->portSem); |
416 | if (RIOParam(PortP, OPEN, ((PortP->Cor2Copy & (COR2_RTSFLOW | COR2_CTSFLOW)) == (COR2_RTSFLOW | COR2_CTSFLOW)) ? TRUE : FALSE, DONT_SLEEP) == RIO_FAIL) { | 410 | if (RIOParam(PortP, OPEN, ((PortP->Cor2Copy & (COR2_RTSFLOW | COR2_CTSFLOW)) == (COR2_RTSFLOW | COR2_CTSFLOW)) ? 1 : 0, DONT_SLEEP) == RIO_FAIL) { |
417 | continue; /* with next port */ | 411 | continue; /* with next port */ |
418 | } | 412 | } |
419 | rio_spin_lock(&PortP->portSem); | 413 | rio_spin_lock(&PortP->portSem); |
420 | PortP->MagicFlags &= ~MAGIC_REBOOT; | 414 | PortP->MagicFlags &= ~MAGIC_REBOOT; |
421 | } | 415 | } |
422 | #endif | ||
423 | 416 | ||
424 | /* | 417 | /* |
425 | ** As mentioned above, this is a tacky hack to cope | 418 | ** As mentioned above, this is a tacky hack to cope |