Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / char / rio / rioroute.c

diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c
index a99f3d9d7d652a1bfa63d142890de86448cbe991..7a9df7dcf9a88d54677d798d04b34972624f0864 100644 (file)
--- a/drivers/char/rio/rioroute.c
+++ b/drivers/char/rio/rioroute.c
@@ -39,7 +39,6 @@ static char *_rioroute_c_sccs_ = "@(#)rioroute.c      1.3";
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/string.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/termios.h>
@@ -527,7 +526,7 @@ void RIOFixPhbs(struct rio_info *p, struct Host *HostP, unsigned int unit)
                         ** If RTA is not powered on, the tx packets will be
                         ** unset, so go no further.
                         */
-                       if (PortP->TxStart == 0) {
+                       if (!PortP->TxStart) {
                                rio_dprintk(RIO_DEBUG_ROUTE, "Tx pkts not set up yet\n");
                                rio_spin_unlock_irqrestore(&PortP->portSem, flags);
                                break;