Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / tty / cyclades.c

diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index c0e8f2e..c9bf779 100644 (file)
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -45,7 +45,6 @@
 #undef CY_DEBUG_IO
 #undef CY_DEBUG_COUNT
 #undef CY_DEBUG_DTR
-#undef CY_DEBUG_WAIT_UNTIL_SENT
 #undef CY_DEBUG_INTERRUPTS
 #undef CY_16Y_HACK
 #undef CY_ENABLE_MONITORING
@@ -1678,16 +1677,10 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
         */
        if (!timeout || timeout > 2 * info->timeout)
                timeout = 2 * info->timeout;
-#ifdef CY_DEBUG_WAIT_UNTIL_SENT
-       printk(KERN_DEBUG "In cy_wait_until_sent(%d) check=%d, jiff=%lu...",
-               timeout, char_time, jiffies);
-#endif
+
        card = info->card;
        if (!cy_is_Z(card)) {
                while (cyy_readb(info, CySRER) & CyTxRdy) {
-#ifdef CY_DEBUG_WAIT_UNTIL_SENT
-                       printk(KERN_DEBUG "Not clean (jiff=%lu)...", jiffies);
-#endif
                        if (msleep_interruptible(jiffies_to_msecs(char_time)))
                                break;
                        if (timeout && time_after(jiffies, orig_jiffies +
@@ -1697,9 +1690,6 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
        }
        /* Run one more char cycle */
        msleep_interruptible(jiffies_to_msecs(char_time * 5));
-#ifdef CY_DEBUG_WAIT_UNTIL_SENT
-       printk(KERN_DEBUG "Clean (jiff=%lu)...done\n", jiffies);
-#endif
 }
 
 static void cy_flush_buffer(struct tty_struct *tty)
@@ -3377,7 +3367,7 @@ static int __init cy_detect_isa(void)
 
                /* allocate IRQ */
                if (request_irq(cy_isa_irq, cyy_interrupt,
-                               IRQF_DISABLED, "Cyclom-Y", &cy_card[j])) {
+                               0, "Cyclom-Y", &cy_card[j])) {
                        printk(KERN_ERR "Cyclom-Y/ISA found at 0x%lx, but "
                                "could not allocate IRQ#%d.\n",
                                (unsigned long)cy_isa_address, cy_isa_irq);