Module Name: src
Committed By: pooka
Date: Thu Apr 22 08:45:56 UTC 2010
Modified Files:
src/sys/dev/usb: pseye.c uvideo.c
Log Message:
fix compilation with -Wmissing-field-initializers.
smoke _KERNEL_OPT where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/pseye.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/usb/uvideo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.15 src/sys/dev/usb/pseye.c:1.16
--- src/sys/dev/usb/pseye.c:1.15 Sun Dec 6 21:40:31 2009
+++ src/sys/dev/usb/pseye.c Thu Apr 22 08:45:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.15 2009/12/06 21:40:31 dyoung Exp $ */
+/* $NetBSD: pseye.c,v 1.16 2010/04/22 08:45:55 pooka Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <jmcne...@invisible.ca>
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.15 2009/12/06 21:40:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.16 2010/04/22 08:45:55 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -848,7 +848,7 @@
.cf_flags = 0,
.cf_pspec = &uhubparent,
},
- { NULL }
+ { NULL, NULL, 0, 0, NULL, 0, NULL }
};
static int
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.30 src/sys/dev/usb/uvideo.c:1.31
--- src/sys/dev/usb/uvideo.c:1.30 Thu Nov 12 20:01:15 2009
+++ src/sys/dev/usb/uvideo.c Thu Apr 22 08:45:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.30 2009/11/12 20:01:15 dyoung Exp $ */
+/* $NetBSD: uvideo.c,v 1.31 2010/04/22 08:45:55 pooka Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.30 2009/11/12 20:01:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.31 2010/04/22 08:45:55 pooka Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -75,7 +75,7 @@
#include <dev/usb/uvideoreg.h>
-#if !defined(_MODULE)
+#if defined(_KERNEL_OPT)
#include "opt_uvideo.h"
#endif
@@ -2342,7 +2342,7 @@
.cf_flags = 0,
.cf_pspec = &uhubparent,
},
- { NULL }
+ { NULL, NULL, 0, 0, NULL, 0, NULL },
};
static int
