diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/dev/usb/ugraphire_rdesc.h
index ddf889c51caa..fe5aaeb3f5a9 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/dev/usb/ugraphire_rdesc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ugraphire_rdesc.h,v 1.2 2004/01/04 01:29:11 augustss Exp $	*/
+/*	$NetBSD: ugraphire_rdesc.h,v 1.3 2004/01/04 08:35:52 jdolecek Exp $	*/
 /*
  * Copyright (c) 2000 Nick Hibma <n_hibma@freebsd.org>
  * All rights reserved.
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-static uByte uhid_graphire_report_descr[] = {
+static const uByte uhid_graphire_report_descr[] = {
     0x05, 0x0d,                    /*  USAGE_PAGE (Digitizers)		*/
     0x09, 0x01,                    /*  USAGE (Digitizer)		*/
     0xa1, 0x01,                    /*  COLLECTION (Application)		*/
@@ -90,7 +90,7 @@ static uByte uhid_graphire_report_descr[] = {
     0xc0,                          /*  END_COLLECTION			*/
 };
 
-static uByte uhid_graphire3_4x5_report_descr[] = {
+static const uByte uhid_graphire3_4x5_report_descr[] = {
     0x05, 0x01,                    /* USAGE_PAGE (Generic Desktop)	*/
     0x09, 0x02,                    /* USAGE (Mouse)			*/
     0xa1, 0x01,                    /* COLLECTION (Application)		*/
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 8c984bc7141d..2bab8f589780 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhidev.c,v 1.18 2004/01/04 02:13:11 dsainty Exp $	*/
+/*	$NetBSD: uhidev.c,v 1.19 2004/01/04 08:35:52 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.18 2004/01/04 02:13:11 dsainty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.19 2004/01/04 08:35:52 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -109,7 +109,8 @@ USB_ATTACH(uhidev)
 	struct uhidev *dev;
 	int size, nrepid, repid, repsz;
 	int repsizes[256];
-	void *desc, *descptr = NULL;
+	void *desc;
+	const void *descptr = NULL;
 	usbd_status err;
 	char devinfo[1024];