[PATCH] Serial: Split 8250 port table

[linux-2.6] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 2d1ac5058534cdd8db3ecb86233ab31d247e2c44..eb282b5815464a478ae3d2a721014422eadfbb13 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -287,15 +287,14 @@ struct usb_bus {
 
        struct dentry *usbfs_dentry;    /* usbfs dentry entry for the bus */
 
-       struct class_device class_dev;  /* class device for this bus */
+       struct class_device *class_dev; /* class device for this bus */
+       struct kref kref;               /* handles reference counting this bus */
        void (*release)(struct usb_bus *bus);   /* function to destroy this bus's memory */
-#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
+#if defined(CONFIG_USB_MON)
        struct mon_bus *mon_bus;        /* non-null when associated */
        int monitored;                  /* non-zero when monitored */
 #endif
 };
-#define        to_usb_bus(d) container_of(d, struct usb_bus, class_dev)
-
 
 /* -------------------------------------------------------------------------- */