Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

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

diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
index f7ac31856572a141b328a5b94ca43035978bcc36..8d97b3911293bf46436bd743ae9c28aaad714316 100644 (file)
--- a/drivers/char/hvcs.c
+++ b/drivers/char/hvcs.c
@@ -439,7 +439,6 @@ static int hvcs_io(struct hvcs_struct *hvcsd)
        char buf[HVCS_BUFF_LEN] __ALIGNED__;
        unsigned long flags;
        int got = 0;
-       int i;
 
        spin_lock_irqsave(&hvcsd->lock, flags);
 
@@ -905,7 +904,7 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address,
                 * It is possible the vty-server was removed after the irq was
                 * requested but before we have time to enable interrupts.
                 */
-               if (vio_enable_interrupts(vdev) == H_Success)
+               if (vio_enable_interrupts(vdev) == H_SUCCESS)
                        return 0;
                else {
                        printk(KERN_ERR "HVCS: int enable failed for"