$NetBSD: patch-al,v 1.4 2008/04/28 08:28:05 sborrill Exp $

--- src/drivers/usb/bsd/bsd-usb.c.orig	2007-03-07 19:31:11.000000000 +0000
+++ src/drivers/usb/bsd/bsd-usb.c
@@ -27,8 +27,13 @@
 #include "apc.h"
 #include "hidutils.h"
 #include "../usb_common.h"
+#ifdef __DragonFly__
+#include <bus/usb/usb.h>
+#include <bus/usb/usbhid.h>
+#else
 #include <dev/usb/usb.h>
 #include <dev/usb/usbhid.h>
+#endif
 
 /* Compatibility cruft for FreeBSD <= 4.7 */
 #ifndef USB_MAX_DEVNAMES
@@ -357,8 +357,9 @@
 int pusb_ups_get_capabilities(UPSINFO *ups, const struct s_known_info *known_info)
 {
    int i, rc, ci, phys;
+   int input, feature;
    USB_DATA *my_data = (USB_DATA *)ups->driver_internal_data;
-   hid_item_t item;
+   hid_item_t item, witem;
    USB_INFO *info;
 
    write_lock(ups);
@@ -780,7 +781,7 @@
    return true;
 }
 
-int pusb_write_int_to_ups(UPSINFO *ups, int ci, int value, char *name)
+int pusb_write_int_to_ups(UPSINFO *ups, int ci, int value, const char *name)
 {
    USB_DATA *my_data = (USB_DATA *)ups->driver_internal_data;
    USB_INFO *info;
