diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-07-13 08:33:00 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-07-13 08:33:00 +0000 |
| commit | 5b506aee19dd5e0e7cbfb10451c05ebf2bcb9739 (patch) | |
| tree | 06c09ba708961c0b5d4c9796678ce79e21536c77 /drivers/dahdi/xpp/xpp_usb.c | |
| parent | 352a000d4f9ec3944bf23e0dda56466a10ad595e (diff) | |
Fix building without CONFIG_PROC_FS defined
This changeset should have no functional changes.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8877 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xpp_usb.c')
| -rw-r--r-- | drivers/dahdi/xpp/xpp_usb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c index 15507ee..40e5f9e 100644 --- a/drivers/dahdi/xpp/xpp_usb.c +++ b/drivers/dahdi/xpp/xpp_usb.c @@ -266,7 +266,9 @@ static void xpp_send_callback(USB_PASS_CB(urb)); static void xpp_receive_callback(USB_PASS_CB(urb)); static int xusb_probe (struct usb_interface *interface, const struct usb_device_id *id); static void xusb_disconnect (struct usb_interface *interface); +#ifdef CONFIG_PROC_FS static int xusb_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data); +#endif /*------------------------------------------------------------------*/ @@ -656,7 +658,9 @@ static int xusb_probe(struct usb_interface *interface, const struct usb_device_i struct usb_host_interface *iface_desc = usb_altnum_to_altsetting(interface, 0); xusb_t *xusb = NULL; struct xusb_model_info *model_info = (struct xusb_model_info*)id->driver_info; +#ifdef CONFIG_PROC_FS struct proc_dir_entry *procsummary = NULL; +#endif xbus_t *xbus = NULL; unsigned long flags; int retval = -ENOMEM; @@ -784,11 +788,13 @@ probe_failed: KZFREE(xusb); } if(xbus) { +#ifdef CONFIG_PROC_FS if(procsummary) { XBUS_DBG(PROC, xbus, "Remove proc_entry: " PROC_USBXPP_SUMMARY "\n"); remove_proc_entry(PROC_USBXPP_SUMMARY, xbus->proc_xbus_dir); procsummary = NULL; } +#endif ERR("Calling xbus_disconnect()\n"); xbus_disconnect(xbus); // Blocking until fully deactivated! } |