diff --git a/[refs] b/[refs] index f986f8ca7030..cad9458b728f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccce6debb62d94964e3878f978a56b0f3e32d94f +refs/heads/master: a03006860d272eac5a8ebf23f04f54c7e1e783a5 diff --git a/trunk/include/linux/serial_core.h b/trunk/include/linux/serial_core.h index 284ef7f54890..f98dc78abb27 100644 --- a/trunk/include/linux/serial_core.h +++ b/trunk/include/linux/serial_core.h @@ -336,19 +336,8 @@ struct uart_port { void *private_data; /* generic platform data pointer */ }; -/* - * This is the state information which is only valid when the port - * is open; it may be cleared the core driver once the device has - * been closed. Either the low level driver or the core can modify - * stuff here. - */ -typedef unsigned int __bitwise__ uif_t; - - /* * This is the state information which is persistent across opens. - * The low level driver must not to touch any elements contained - * within. */ struct uart_state { struct tty_port port;