summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2013-07-24 18:32:15 +0000
committerobrien <obrien@FreeBSD.org>2013-07-24 18:32:15 +0000
commit7f974d1e5e7c2bb7f4ce945d0fc55918134caab7 (patch)
tree23813d2e035abb3bddbc8cb23f05daa07ba23a41
parent13d997511f0f5b090e9ce6689f7b17489cffbf8a (diff)
downloadFreeBSD-src-7f974d1e5e7c2bb7f4ce945d0fc55918134caab7.zip
FreeBSD-src-7f974d1e5e7c2bb7f4ce945d0fc55918134caab7.tar.gz
per style(9):
Kernel include files (i.e. sys/*.h) come first; normally, include <sys/types.h> OR <sys/param.h>, but not both. <sys/types.h> includes <sys/cdefs.h>, and it is okay to depend on that.
-rw-r--r--sys/dev/usb/gadget/g_audio.c6
-rw-r--r--sys/dev/usb/gadget/g_keyboard.c6
-rw-r--r--sys/dev/usb/gadget/g_modem.c6
-rw-r--r--sys/dev/usb/gadget/g_mouse.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/usb/gadget/g_audio.c b/sys/dev/usb/gadget/g_audio.c
index 4a51b68..a1d2394 100644
--- a/sys/dev/usb/gadget/g_audio.c
+++ b/sys/dev/usb/gadget/g_audio.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
@@ -30,11 +29,12 @@
* http://www.usb.org/developers/devclass_docs/termt10.pdf
*/
+#include <sys/param.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/stdint.h>
#include <sys/stddef.h>
-#include <sys/param.h>
#include <sys/queue.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/bus.h>
diff --git a/sys/dev/usb/gadget/g_keyboard.c b/sys/dev/usb/gadget/g_keyboard.c
index 8dbc61c..465a34ce 100644
--- a/sys/dev/usb/gadget/g_keyboard.c
+++ b/sys/dev/usb/gadget/g_keyboard.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
@@ -28,11 +27,12 @@
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
*/
+#include <sys/param.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/stdint.h>
#include <sys/stddef.h>
-#include <sys/param.h>
#include <sys/queue.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/bus.h>
diff --git a/sys/dev/usb/gadget/g_modem.c b/sys/dev/usb/gadget/g_modem.c
index 7526f2e..f26c4fd 100644
--- a/sys/dev/usb/gadget/g_modem.c
+++ b/sys/dev/usb/gadget/g_modem.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
@@ -30,11 +29,12 @@
* http://www.usb.org/developers/devclass_docs/cdc_wmc10.zip
*/
+#include <sys/param.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/stdint.h>
#include <sys/stddef.h>
-#include <sys/param.h>
#include <sys/queue.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/bus.h>
diff --git a/sys/dev/usb/gadget/g_mouse.c b/sys/dev/usb/gadget/g_mouse.c
index b81cee9..a87889b 100644
--- a/sys/dev/usb/gadget/g_mouse.c
+++ b/sys/dev/usb/gadget/g_mouse.c
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
/*-
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
*
@@ -28,11 +27,12 @@
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
*/
+#include <sys/param.h>
+__FBSDID("$FreeBSD$");
+
#include <sys/stdint.h>
#include <sys/stddef.h>
-#include <sys/param.h>
#include <sys/queue.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/bus.h>
OpenPOWER on IntegriCloud