diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-23 19:03:20 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-23 19:03:20 -0700 |
| commit | fa5cfae37799177769e9ae2c0527fbdfea462fa9 (patch) | |
| tree | 02f99e208949486c8899a310846dee444bac8093 /include/linux/usb.h | |
| parent | 0c0ff09329dafb165c0d9ac08965ddc0615020b1 (diff) | |
| parent | 16822e62053e73fa7def9decc38a7e287d27d980 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 3d508bf08402..eb282b581546 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -290,7 +290,7 @@ struct usb_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 |