← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/hal/oneiric

« back to all changes in this revision

Viewing changes to hald/freebsd/probing/probe-usb2-interface.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-02-14 11:45:59 UTC
  • Revision ID: james.westby@ubuntu.com-20110214114559-g5ti3fxottbysekt
Tags: 0.5.14-5+svn1
https://launchpad.net/bugs/721399
Upload current Debian svn head to fix FTBFS.

* Add 00upstream_video4linux_check.patch: Do not build
  hald-probe-video4linux if v4l1 is not available. (LP: #721399)
* Refresh 99-autoreconf.patch for above.
* 45-fix-libusb-detection.patch: Unfuzz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hald/freebsd/probing/probe-usb2-interface.c
34
34
 
35
35
#include <libusb20_desc.h>
36
36
#include <libusb20.h>
37
 
#if __FreeBSD_version >= 800064
 
37
#if (__FreeBSD_version >= 800064) || (__FreeBSD_kernel_version >= 800064)
38
38
#include <dev/usb/usb_ioctl.h>
39
39
#else
40
40
#include <dev/usb2/include/usb2_standard.h>