Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into...

[~andy/linux] / include / linux / usb / serial.h

diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index fbb666b1b67008ef38d9f7c2b0e9682e924fbae7..4742838882332ac766a97ddc9c582afde6127457 100644 (file)
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -28,13 +28,6 @@
 /* parity check flag */
 #define RELEVANT_IFLAG(iflag)  (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
 
-enum port_dev_state {
-       PORT_UNREGISTERED,
-       PORT_REGISTERING,
-       PORT_REGISTERED,
-       PORT_UNREGISTERING,
-};
-
 /* USB serial flags */
 #define USB_SERIAL_WRITE_BUSY  0
 
@@ -124,7 +117,6 @@ struct usb_serial_port {
        char                    throttle_req;
        unsigned long           sysrq; /* sysrq timeout */
        struct device           dev;
-       enum port_dev_state     dev_state;
 };
 #define to_usb_serial_port(d) container_of(d, struct usb_serial_port, dev)