[src/trunk]: src/sys/dev/usb fix compilation with -Wmissing-field-initializers.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3ee655da95fc
branches:  trunk
changeset: 754160:3ee655da95fc
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Apr 22 08:45:55 2010 +0000

description:
fix compilation with -Wmissing-field-initializers.
smoke _KERNEL_OPT where appropriate.

diffstat:

 sys/dev/usb/pseye.c  |  6 +++---
 sys/dev/usb/uvideo.c |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 23ce9833406c -r 3ee655da95fc sys/dev/usb/pseye.c
--- a/sys/dev/usb/pseye.c       Thu Apr 22 08:42:34 2010 +0000
+++ b/sys/dev/usb/pseye.c       Thu Apr 22 08:45:55 2010 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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
diff -r 23ce9833406c -r 3ee655da95fc sys/dev/usb/uvideo.c
--- a/sys/dev/usb/uvideo.c      Thu Apr 22 08:42:34 2010 +0000
+++ b/sys/dev/usb/uvideo.c      Thu Apr 22 08:45:55 2010 +0000
@@ -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