Merge branch 'pm-sleep'

[cascardo/linux.git] / drivers / tty / cyclades.c

diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 3840d6b..5e4fa92 100644 (file)
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -93,8 +93,6 @@ static void cy_send_xchar(struct tty_struct *tty, char ch);
 #define        SERIAL_XMIT_SIZE        (min(PAGE_SIZE, 4096))
 #endif
 
-#define STD_COM_FLAGS (0)
-
 /* firmware stuff */
 #define ZL_MAX_BLOCKS  16
 #define DRIVER_VERSION 0x02010203
@@ -2288,7 +2286,6 @@ static int cy_get_serial_info(struct cyclades_port *info,
                .closing_wait = info->port.closing_wait,
                .baud_base = info->baud,
                .custom_divisor = info->custom_divisor,
-               .hub6 = 0,              /*!!! */
        };
        return copy_to_user(retinfo, &tmp, sizeof(*retinfo)) ? -EFAULT : 0;
 }
@@ -3084,7 +3081,6 @@ static int cy_init_card(struct cyclades_card *cinfo)
 
                info->port.closing_wait = CLOSING_WAIT_DELAY;
                info->port.close_delay = 5 * HZ / 10;
-               info->port.flags = STD_COM_FLAGS;
                init_completion(&info->shutdown_wait);
 
                if (cy_is_Z(cinfo)) {