From 32af04f740541c3e943edbdb70f13dff978147be Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 12 Dec 2009 13:05:15 +0100 Subject: [PATCH] Remove inclusion of from kernel .c files. They are not needed and mostly leftovers from former __FBSDID and the likes. Also add some missing CVS ids to the comments. --- sys/bus/firewire/fwcrom.c | 7 +------ sys/bus/firewire/fwdma.c | 7 +------ sys/bus/firewire/fwmem.c | 7 +------ sys/crypto/camellia/camellia-api.c | 2 -- sys/crypto/camellia/camellia.c | 1 - sys/crypto/rijndael/rijndael-alg-fst.c | 1 - sys/crypto/sha1.c | 1 - sys/dev/acpica5/acpi.c | 5 ++--- sys/dev/acpica5/acpi_acad.c | 3 +-- sys/dev/acpica5/acpi_asus/acpi_asus.c | 3 +-- sys/dev/acpica5/acpi_battery.c | 3 +-- sys/dev/acpica5/acpi_button.c | 3 +-- sys/dev/acpica5/acpi_cmbat.c | 5 ++--- sys/dev/acpica5/acpi_ec.c | 5 ++--- sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c | 2 -- sys/dev/acpica5/acpi_hp/acpi_hp.c | 3 +-- sys/dev/acpica5/acpi_isab.c | 3 +-- sys/dev/acpica5/acpi_lid.c | 3 +-- sys/dev/acpica5/acpi_package.c | 5 ++--- sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c | 2 -- sys/dev/acpica5/acpi_pci.c | 5 ++--- sys/dev/acpica5/acpi_pci_link.c | 5 ++--- sys/dev/acpica5/acpi_pcib.c | 5 ++--- sys/dev/acpica5/acpi_pcib_acpi.c | 5 ++--- sys/dev/acpica5/acpi_pcib_pci.c | 5 ++--- sys/dev/acpica5/acpi_powerres.c | 5 ++--- sys/dev/acpica5/acpi_resource.c | 5 ++--- sys/dev/acpica5/acpi_sony/acpi_sony.c | 3 +-- sys/dev/acpica5/acpi_thermal.c | 3 +-- sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c | 3 +-- sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c | 2 -- sys/dev/acpica5/aibs/atk0110.c | 1 - sys/dev/agp/agp_ati.c | 3 --- sys/dev/crypto/glxsb/glxsb.c | 4 ++-- sys/dev/crypto/glxsb/glxsb_hash.c | 4 ++-- sys/dev/disk/mpt/mpt.c | 3 +-- sys/dev/disk/mpt/mpt_cam.c | 2 +- sys/dev/disk/mpt/mpt_debug.c | 3 +-- sys/dev/disk/mpt/mpt_pci.c | 3 +-- sys/dev/disk/mpt/mpt_raid.c | 3 +-- sys/dev/disk/mpt/mpt_user.c | 3 +-- sys/dev/misc/gpio/gpio.c | 1 - sys/dev/misc/gpio/gpio_led.c | 2 -- sys/dev/misc/nsclpcsio/nsclpcsio_isa.c | 1 - sys/dev/netif/mxge/if_mxge.c | 5 ++--- sys/dev/netif/mxge/mxge_lro.c | 5 ++--- sys/dev/netif/xe/if_xe.c | 2 -- sys/dev/powermng/coretemp/coretemp.c | 2 -- sys/dev/powermng/it/it.c | 2 -- sys/dev/powermng/lm/lm78.c | 2 -- sys/dev/powermng/lm/lm78_isa.c | 2 -- sys/dev/sound/usb/uaudio.c | 3 --- sys/dev/usbmisc/uftdi/uftdi.c | 3 --- sys/kern/kern_sensors.c | 2 -- sys/kern/subr_power.c | 3 +-- sys/kern/sys_mqueue.c | 3 --- sys/net/bridge/bridgestp.c | 3 --- sys/netbt/l2cap_socket.c | 3 --- sys/netbt/l2cap_upper.c | 3 --- sys/netbt/sco_socket.c | 3 --- sys/netbt/sco_upper.c | 3 --- sys/platform/pc32/i386/cs5536.c | 1 - sys/platform/pc32/i386/dump_machdep.c | 4 ++-- sys/platform/pc32/i386/geode.c | 1 - sys/platform/pc32/i386/minidump_machdep.c | 4 ++-- sys/platform/pc32/i386/p4tcc.c | 3 --- sys/platform/pc32/isa/pmtimer.c | 3 --- sys/platform/pc64/isa/pmtimer.c | 4 ---- sys/platform/pc64/x86_64/dump_machdep.c | 4 ++-- sys/platform/pc64/x86_64/minidump_machdep.c | 4 ++-- sys/vfs/isofs/cd9660/cd9660_iconv/cd9660_iconv.c | 4 ++-- sys/vfs/msdosfs/msdosfs_iconv/msdosfs_iconv.c | 5 ++--- sys/vfs/ntfs/ntfs_iconv/ntfs_iconv.c | 3 +-- 73 files changed, 63 insertions(+), 176 deletions(-) diff --git a/sys/bus/firewire/fwcrom.c b/sys/bus/firewire/fwcrom.c index c4faeb4d85..45407f672c 100644 --- a/sys/bus/firewire/fwcrom.c +++ b/sys/bus/firewire/fwcrom.c @@ -31,14 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/bus/firewire/fwcrom.c,v 1.10 2007/05/13 18:33:56 swildner Exp $ + * $FreeBSD: src/sys/dev/firewire/fwcrom.c,v 1.9 2003/10/02 04:06:55 simokawa Exp $ */ -#ifndef __DragonFly__ -#include -__FBSDID("$FreeBSD: src/sys/dev/firewire/fwcrom.c,v 1.9 2003/10/02 04:06:55 simokawa Exp $"); -#endif - #include #if defined(_KERNEL) || defined(TEST) #include diff --git a/sys/bus/firewire/fwdma.c b/sys/bus/firewire/fwdma.c index 122698a647..1662f953e9 100644 --- a/sys/bus/firewire/fwdma.c +++ b/sys/bus/firewire/fwdma.c @@ -31,14 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/bus/firewire/fwdma.c,v 1.10 2008/01/06 16:55:49 swildner Exp $ + * $FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.5 2003/08/24 17:46:07 obrien Exp $ */ -#ifndef __DragonFly__ -#include -__FBSDID("$FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.5 2003/08/24 17:46:07 obrien Exp $"); -#endif - #include #include #include diff --git a/sys/bus/firewire/fwmem.c b/sys/bus/firewire/fwmem.c index ba39b0fc41..ec6ece6140 100644 --- a/sys/bus/firewire/fwmem.c +++ b/sys/bus/firewire/fwmem.c @@ -31,14 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $DragonFly: src/sys/bus/firewire/fwmem.c,v 1.16 2008/01/06 16:55:49 swildner Exp $ + * $FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.26 2004/01/05 14:21:18 simokawa Exp $ */ -#ifndef __DragonFly__ -#include -__FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.26 2004/01/05 14:21:18 simokawa Exp $"); -#endif - #include #include #include diff --git a/sys/crypto/camellia/camellia-api.c b/sys/crypto/camellia/camellia-api.c index 75f6eef87c..1be038b1ee 100644 --- a/sys/crypto/camellia/camellia-api.c +++ b/sys/crypto/camellia/camellia-api.c @@ -27,8 +27,6 @@ * $FreeBSD: src/sys/crypto/camellia/camellia-api.c,v 1.1 2007/05/09 19:37:01 gnn Exp $ */ -#include - #include #ifdef _KERNEL #include diff --git a/sys/crypto/camellia/camellia.c b/sys/crypto/camellia/camellia.c index 91f59979bb..240b3d3f79 100644 --- a/sys/crypto/camellia/camellia.c +++ b/sys/crypto/camellia/camellia.c @@ -32,7 +32,6 @@ * http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html */ -#include #include #include #ifdef _KERNEL diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c index 7ec54cd162..45ebaf0196 100644 --- a/sys/crypto/rijndael/rijndael-alg-fst.c +++ b/sys/crypto/rijndael/rijndael-alg-fst.c @@ -26,7 +26,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #ifdef _KERNEL #include diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c index 396c8cac25..8093fc7f0a 100644 --- a/sys/crypto/sha1.c +++ b/sys/crypto/sha1.c @@ -36,7 +36,6 @@ */ #include -#include #include #include diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica5/acpi.c index 22c36b92e1..74e9dc4db4 100644 --- a/sys/dev/acpica5/acpi.c +++ b/sys/dev/acpica5/acpi.c @@ -25,11 +25,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.243.2.4.4.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.243.2.4.4.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_acad.c b/sys/dev/acpica5/acpi_acad.c index 059045d04c..b8bb96af48 100644 --- a/sys/dev/acpica5/acpi_acad.c +++ b/sys/dev/acpica5/acpi_acad.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpica/acpi_acad.c,v 1.39 2009/06/05 18:44:36 jkim Exp */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_asus/acpi_asus.c b/sys/dev/acpica5/acpi_asus/acpi_asus.c index 2878421b18..2961da0c08 100644 --- a/sys/dev/acpica5/acpi_asus/acpi_asus.c +++ b/sys/dev/acpica5/acpi_asus/acpi_asus.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.42 2009/06/05 18:44:36 jkim Exp */ -#include - /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on * recent Asus (and Medion) laptops. Inspired by the acpi4asus project which diff --git a/sys/dev/acpica5/acpi_battery.c b/sys/dev/acpica5/acpi_battery.c index 5e66ab24d0..80daf791fa 100644 --- a/sys/dev/acpica5/acpi_battery.c +++ b/sys/dev/acpica5/acpi_battery.c @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.30 2009/08/20 19:17:53 jhb */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_button.c b/sys/dev/acpica5/acpi_button.c index 1ccc1e498a..c3e454e9af 100644 --- a/sys/dev/acpica5/acpi_button.c +++ b/sys/dev/acpica5/acpi_button.c @@ -24,11 +24,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.33 2009/06/05 18:44:36 jkim Exp */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_cmbat.c b/sys/dev/acpica5/acpi_cmbat.c index bd8c781897..719a41509c 100644 --- a/sys/dev/acpica5/acpi_cmbat.c +++ b/sys/dev/acpica5/acpi_cmbat.c @@ -25,11 +25,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.46.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_cmbat.c,v 1.46.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_ec.c b/sys/dev/acpica5/acpi_ec.c index 107e8efcd4..62132fc47a 100644 --- a/sys/dev/acpica5/acpi_ec.c +++ b/sys/dev/acpica5/acpi_ec.c @@ -24,11 +24,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.76.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.76.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c b/sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c index 6e698eee7d..711a587d61 100644 --- a/sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c +++ b/sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c @@ -28,8 +28,6 @@ * $FreeBSD: src/sys/dev/acpi_support/acpi_fujitsu.c,v 1.7 2009/06/05 18:44:36 jkim */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_hp/acpi_hp.c b/sys/dev/acpica5/acpi_hp/acpi_hp.c index 1c3e0dc99a..d3f570ecf3 100644 --- a/sys/dev/acpica5/acpi_hp/acpi_hp.c +++ b/sys/dev/acpica5/acpi_hp/acpi_hp.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpi_support/acpi_hp.c,v 1.3 2009/07/03 21:12:37 rpaulo */ -#include - /* * Driver for extra ACPI-controlled features found on HP laptops * that use a WMI enabled BIOS (e.g. HP Compaq 8510p and 6510p). diff --git a/sys/dev/acpica5/acpi_isab.c b/sys/dev/acpica5/acpi_isab.c index 27a51928ea..57df5e21ac 100644 --- a/sys/dev/acpica5/acpi_isab.c +++ b/sys/dev/acpica5/acpi_isab.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpica/acpi_isab.c,v 1.11 2009/06/05 18:44:36 jkim */ -#include - /* * ISA Bridge driver for Generic ISA Bus Devices. See section 10.7 of the * ACPI 2.0a specification for details on this device. diff --git a/sys/dev/acpica5/acpi_lid.c b/sys/dev/acpica5/acpi_lid.c index ba1ed01804..89ca8cd6e4 100644 --- a/sys/dev/acpica5/acpi_lid.c +++ b/sys/dev/acpica5/acpi_lid.c @@ -25,11 +25,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.30 2009/06/05 18:44:36 jkim Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_package.c b/sys/dev/acpica5/acpi_package.c index 4123c4477c..31e3e2277a 100644 --- a/sys/dev/acpica5/acpi_package.c +++ b/sys/dev/acpica5/acpi_package.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include #include #include diff --git a/sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c b/sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c index 66d6ff215d..1134aa38b1 100644 --- a/sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c +++ b/sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c @@ -27,8 +27,6 @@ * $FreeBSD: src/sys/dev/acpi_support/acpi_panasonic.c,v 1.15 2009/06/05 18:44:36 jkim */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_pci.c b/sys/dev/acpica5/acpi_pci.c index a008f53604..16b274afc1 100644 --- a/sys/dev/acpica5/acpi_pci.c +++ b/sys/dev/acpica5/acpi_pci.c @@ -24,11 +24,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include #include #include diff --git a/sys/dev/acpica5/acpi_pci_link.c b/sys/dev/acpica5/acpi_pci_link.c index 986fa6f8bb..b209b6c861 100644 --- a/sys/dev/acpica5/acpi_pci_link.c +++ b/sys/dev/acpica5/acpi_pci_link.c @@ -22,15 +22,14 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.56.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.56.2.1.6.1 2009/04/15 03:14:26 kensmith Exp $ */ #define MPASS(ex) MPASS4(ex, #ex, __FILE__, __LINE__) #define MPASS4(ex, what, file, line) \ KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line)) -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_pcib.c b/sys/dev/acpica5/acpi_pcib.c index 03dddbd21f..9c2da459b2 100644 --- a/sys/dev/acpica5/acpi_pcib.c +++ b/sys/dev/acpica5/acpi_pcib.c @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.60.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.60.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_pcib_acpi.c b/sys/dev/acpica5/acpi_pcib_acpi.c index 92dbadbaf5..6e718264ac 100644 --- a/sys/dev/acpica5/acpi_pcib_acpi.c +++ b/sys/dev/acpica5/acpi_pcib_acpi.c @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_pcib_pci.c b/sys/dev/acpica5/acpi_pcib_pci.c index 9a622b5136..45e35a128c 100644 --- a/sys/dev/acpica5/acpi_pcib_pci.c +++ b/sys/dev/acpica5/acpi_pcib_pci.c @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.17.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.17.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include diff --git a/sys/dev/acpica5/acpi_powerres.c b/sys/dev/acpica5/acpi_powerres.c index 126368051b..76bf64cf88 100644 --- a/sys/dev/acpica5/acpi_powerres.c +++ b/sys/dev/acpica5/acpi_powerres.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.30.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.30.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_resource.c b/sys/dev/acpica5/acpi_resource.c index c337804a17..e09722eab9 100644 --- a/sys/dev/acpica5/acpi_resource.c +++ b/sys/dev/acpica5/acpi_resource.c @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.40.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.40.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_sony/acpi_sony.c b/sys/dev/acpica5/acpi_sony/acpi_sony.c index 5b13c8e7df..135b682ccd 100644 --- a/sys/dev/acpica5/acpi_sony/acpi_sony.c +++ b/sys/dev/acpica5/acpi_sony/acpi_sony.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpi_support/acpi_sony.c,v 1.13 2009/06/05 18:44:36 jkim */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_thermal.c b/sys/dev/acpica5/acpi_thermal.c index 372fef7269..add6f4f696 100644 --- a/sys/dev/acpica5/acpi_thermal.c +++ b/sys/dev/acpica5/acpi_thermal.c @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.73 2009/08/20 19:17:53 jhb */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c b/sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c index 03622fb56f..42507e0a4d 100644 --- a/sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c +++ b/sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c @@ -23,11 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.19 2009/06/05 18:44:36 jkim */ -#include - /* * Driver for extra ACPI-controlled gadgets found on IBM ThinkPad laptops. * Inspired by the ibm-acpi and tpb projects which implement these features diff --git a/sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c b/sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c index 699273f93a..5b6c8d4bd2 100644 --- a/sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c +++ b/sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c @@ -26,8 +26,6 @@ * $FreeBSD: src/sys/dev/acpi_support/acpi_toshiba.c,v 1.18 2009/06/05 18:44:36 jkim */ -#include - #include "opt_acpi.h" #include #include diff --git a/sys/dev/acpica5/aibs/atk0110.c b/sys/dev/acpica5/aibs/atk0110.c index 9a2978293a..11cf757b07 100644 --- a/sys/dev/acpica5/aibs/atk0110.c +++ b/sys/dev/acpica5/aibs/atk0110.c @@ -16,7 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/sys/dev/agp/agp_ati.c b/sys/dev/agp/agp_ati.c index de466a6bbd..463514a526 100644 --- a/sys/dev/agp/agp_ati.c +++ b/sys/dev/agp/agp_ati.c @@ -26,11 +26,8 @@ * Based on reading the Linux 2.6.8.1 driver by Dave Jones. * * $FreeBSD: src/sys/dev/agp/agp_ati.c,v 1.5 2007/11/12 21:51:36 jhb Exp $ - * $DragonFly: src/sys/dev/agp/agp_ati.c,v 1.3 2008/01/07 01:34:58 corecode Exp $ */ -#include - #include "opt_bus.h" #include diff --git a/sys/dev/crypto/glxsb/glxsb.c b/sys/dev/crypto/glxsb/glxsb.c index 85b8478694..e07e04c21e 100644 --- a/sys/dev/crypto/glxsb/glxsb.c +++ b/sys/dev/crypto/glxsb/glxsb.c @@ -16,6 +16,8 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * $FreeBSD: src/sys/dev/glxsb/glxsb.c,v 1.3 2008/11/17 07:09:40 philip Exp $ */ /* @@ -23,8 +25,6 @@ * http://www.amd.com/files/connectivitysolutions/geode/geode_lx/33234d_lx_ds.pdf */ -#include - #include #include #include diff --git a/sys/dev/crypto/glxsb/glxsb_hash.c b/sys/dev/crypto/glxsb/glxsb_hash.c index ca2b96c71b..3816aba4cb 100644 --- a/sys/dev/crypto/glxsb/glxsb_hash.c +++ b/sys/dev/crypto/glxsb/glxsb_hash.c @@ -22,10 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/dev/glxsb/glxsb_hash.c,v 1.2 2008/08/11 08:41:08 pjd Exp $ */ -#include - #include #include #include diff --git a/sys/dev/disk/mpt/mpt.c b/sys/dev/disk/mpt/mpt.c index c9faea7077..5279b154aa 100644 --- a/sys/dev/disk/mpt/mpt.c +++ b/sys/dev/disk/mpt/mpt.c @@ -93,11 +93,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/mpt/mpt.c,v 1.49 2009/01/07 21:52:47 marius Exp $ */ -#include - #include #include /* XXX For static handler registration */ #include /* XXX For static handler registration */ diff --git a/sys/dev/disk/mpt/mpt_cam.c b/sys/dev/disk/mpt/mpt_cam.c index 78c4d478ad..b7983774dc 100644 --- a/sys/dev/disk/mpt/mpt_cam.c +++ b/sys/dev/disk/mpt/mpt_cam.c @@ -92,9 +92,9 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/mpt/mpt_cam.c,v 1.68 2009/07/02 00:43:10 delphij Exp $ */ -#include #include #include diff --git a/sys/dev/disk/mpt/mpt_debug.c b/sys/dev/disk/mpt/mpt_debug.c index e585e3c340..8daa3eff55 100644 --- a/sys/dev/disk/mpt/mpt_debug.c +++ b/sys/dev/disk/mpt/mpt_debug.c @@ -61,11 +61,10 @@ * * Support from LSI-Logic has also gone a great deal toward making this a * workable subsystem and is gratefully acknowledged. + * * $FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.18 2006/12/07 22:02:28 mjacob Exp $ */ -#include - #include #include diff --git a/sys/dev/disk/mpt/mpt_pci.c b/sys/dev/disk/mpt/mpt_pci.c index 02999e087a..3ffbdcc66a 100644 --- a/sys/dev/disk/mpt/mpt_pci.c +++ b/sys/dev/disk/mpt/mpt_pci.c @@ -96,11 +96,10 @@ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * * $FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.54 2009/07/10 08:18:08 scottl Exp $ */ -#include - #include #include #include diff --git a/sys/dev/disk/mpt/mpt_raid.c b/sys/dev/disk/mpt/mpt_raid.c index fcb97677e3..08940071d2 100644 --- a/sys/dev/disk/mpt/mpt_raid.c +++ b/sys/dev/disk/mpt/mpt_raid.c @@ -38,11 +38,10 @@ * * Support from LSI-Logic has also gone a great deal toward making this a * workable subsystem and is gratefully acknowledged. + * * $FreeBSD: src/sys/dev/mpt/mpt_raid.c,v 1.20 2009/05/21 12:36:40 jhb Exp $ */ -#include - #include #include diff --git a/sys/dev/disk/mpt/mpt_user.c b/sys/dev/disk/mpt/mpt_user.c index 86eb6da657..5f72aa33e6 100644 --- a/sys/dev/disk/mpt/mpt_user.c +++ b/sys/dev/disk/mpt/mpt_user.c @@ -28,11 +28,10 @@ * SUCH DAMAGE. * * LSI MPT-Fusion Host Adapter FreeBSD userland interface + * * $FreeBSD: src/sys/dev/mpt/mpt_user.c,v 1.4 2009/05/20 17:29:21 imp Exp $ */ -#include - #include #include #include diff --git a/sys/dev/misc/gpio/gpio.c b/sys/dev/misc/gpio/gpio.c index bb90915a82..5c951e46c0 100644 --- a/sys/dev/misc/gpio/gpio.c +++ b/sys/dev/misc/gpio/gpio.c @@ -51,7 +51,6 @@ * XXX: consumer_detach stuff. * XXX: userland stuff. */ -#include #include #include diff --git a/sys/dev/misc/gpio/gpio_led.c b/sys/dev/misc/gpio/gpio_led.c index ad0bbc9369..dfeff59a1e 100644 --- a/sys/dev/misc/gpio/gpio_led.c +++ b/sys/dev/misc/gpio/gpio_led.c @@ -32,8 +32,6 @@ * SUCH DAMAGE. */ -#include - #include #include #include diff --git a/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c b/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c index 237ca6e087..85addd5b5f 100644 --- a/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c +++ b/sys/dev/misc/nsclpcsio/nsclpcsio_isa.c @@ -42,7 +42,6 @@ #include #include #include -#include #include #include diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c index 7379c75aff..9604acd871 100644 --- a/sys/dev/netif/mxge/if_mxge.c +++ b/sys/dev/netif/mxge/if_mxge.c @@ -25,10 +25,9 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -***************************************************************************/ +$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatson Exp $ -#include -/*__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatson Exp $");*/ +***************************************************************************/ #include #include diff --git a/sys/dev/netif/mxge/mxge_lro.c b/sys/dev/netif/mxge/mxge_lro.c index 462164ba3e..fe928781bd 100644 --- a/sys/dev/netif/mxge/mxge_lro.c +++ b/sys/dev/netif/mxge/mxge_lro.c @@ -25,10 +25,9 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -***************************************************************************/ +$FreeBSD: src/sys/dev/mxge/mxge_lro.c,v 1.8 2009/06/23 17:42:06 gallatin Exp $ -#include -/*__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_lro.c,v 1.8 2009/06/23 17:42:06 gallatin Exp $");*/ +***************************************************************************/ #include #include diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c index ce6b5de230..9aea6f9aa9 100644 --- a/sys/dev/netif/xe/if_xe.c +++ b/sys/dev/netif/xe/if_xe.c @@ -25,7 +25,6 @@ * * $Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $ * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.39 2003/10/14 22:51:35 rsm Exp $ - * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.36 2008/08/17 04:32:35 sephe Exp $ */ /* @@ -95,7 +94,6 @@ #include -#include #include #include #include diff --git a/sys/dev/powermng/coretemp/coretemp.c b/sys/dev/powermng/coretemp/coretemp.c index 55d54e5a05..65dbac713d 100644 --- a/sys/dev/powermng/coretemp/coretemp.c +++ b/sys/dev/powermng/coretemp/coretemp.c @@ -24,7 +24,6 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.2 2007/08/23 10:53:03 des Exp $ - * $DragonFly: src/sys/dev/powermng/coretemp/coretemp.c,v 1.3 2008/10/03 00:26:21 hasso Exp $ */ /* @@ -32,7 +31,6 @@ * First introduced in Intel's Core line of processors. */ -#include #include #include #include diff --git a/sys/dev/powermng/it/it.c b/sys/dev/powermng/it/it.c index d684666f6d..cf4a02002b 100644 --- a/sys/dev/powermng/it/it.c +++ b/sys/dev/powermng/it/it.c @@ -23,10 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $OpenBSD: it.c,v 1.22 2007/03/22 16:55:31 deraadt Exp $ - * $DragonFly: src/sys/dev/powermng/it/it.c,v 1.1 2007/10/02 13:37:38 hasso Exp $ */ -#include #include #include #include diff --git a/sys/dev/powermng/lm/lm78.c b/sys/dev/powermng/lm/lm78.c index a5f7115f74..af74d9e2e9 100644 --- a/sys/dev/powermng/lm/lm78.c +++ b/sys/dev/powermng/lm/lm78.c @@ -15,10 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * $OpenBSD: lm78.c,v 1.18 2007/05/26 22:47:39 cnst Exp $ - * $DragonFly: src/sys/dev/powermng/lm/lm78.c,v 1.1 2007/10/02 13:37:38 hasso Exp $ */ -#include #include #include #include diff --git a/sys/dev/powermng/lm/lm78_isa.c b/sys/dev/powermng/lm/lm78_isa.c index 2d73b32cf1..50deacdd53 100644 --- a/sys/dev/powermng/lm/lm78_isa.c +++ b/sys/dev/powermng/lm/lm78_isa.c @@ -15,10 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * $OpenBSD: lm78_isa.c,v 1.2 2007/07/01 21:48:57 cnst Exp $ - * $DragonFly: src/sys/dev/powermng/lm/lm78_isa.c,v 1.1 2007/10/02 13:37:38 hasso Exp $ */ -#include #include #include #include diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index af486a02a4..30cc2bbd47 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1,6 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ /* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.14.2.2 2006/04/04 17:34:10 ariff Exp $ */ -/* $DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.20 2008/04/20 13:44:25 swildner Exp $: */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -45,8 +44,6 @@ * http://www.usb.org/developers/devclass_docs/termt10.pdf */ -#include - /* * Also merged: * $NetBSD: uaudio.c,v 1.94 2005/01/15 15:19:53 kent Exp $ diff --git a/sys/dev/usbmisc/uftdi/uftdi.c b/sys/dev/usbmisc/uftdi/uftdi.c index 1775159c31..c0b2edebc2 100644 --- a/sys/dev/usbmisc/uftdi/uftdi.c +++ b/sys/dev/usbmisc/uftdi/uftdi.c @@ -1,7 +1,6 @@ /* * $NetBSD: uftdi.c,v 1.13 2002/09/23 05:51:23 simonb Exp $ * $FreeBSD: src/sys/dev/usb/uftdi.c,v 1.37 2007/06/22 05:53:05 imp Exp $ - * $DragonFly: src/sys/dev/usbmisc/uftdi/uftdi.c,v 1.23 2007/11/06 07:37:01 hasso Exp $ */ /*- @@ -44,8 +43,6 @@ * FTDI FT8U100AX serial adapter driver */ -#include - #include #include #include diff --git a/sys/kern/kern_sensors.c b/sys/kern/kern_sensors.c index 67d1df2ef2..b8794a18f4 100644 --- a/sys/kern/kern_sensors.c +++ b/sys/kern/kern_sensors.c @@ -1,5 +1,4 @@ /* $OpenBSD: kern_sensors.c,v 1.19 2007/06/04 18:42:05 deraadt Exp $ */ -/* $DragonFly: src/sys/kern/kern_sensors.c,v 1.2 2008/01/05 14:02:38 swildner Exp $ */ /* * Copyright (c) 2005 David Gwynne @@ -18,7 +17,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index c5c0ba02b7..2ac1e64dfc 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $DragonFly: src/sys/kern/subr_power.c,v 1.2 2006/12/23 00:35:04 swildner Exp $ */ -#include - #include #include #include diff --git a/sys/kern/sys_mqueue.c b/sys/kern/sys_mqueue.c index 3fb2da1e8d..607ca45bc0 100644 --- a/sys/kern/sys_mqueue.c +++ b/sys/kern/sys_mqueue.c @@ -41,9 +41,6 @@ * -> mqueue::mq_mtx */ -#include -/*__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.16 2009/04/11 23:05:26 christos Exp $");*/ - #include #include #include diff --git a/sys/net/bridge/bridgestp.c b/sys/net/bridge/bridgestp.c index b086c60713..56683b16c3 100644 --- a/sys/net/bridge/bridgestp.c +++ b/sys/net/bridge/bridgestp.c @@ -31,7 +31,6 @@ * $OpenBSD: bridgestp.c,v 1.5 2001/03/22 03:48:29 jason Exp $ * $NetBSD: bridgestp.c,v 1.5 2003/11/28 08:56:48 keihan Exp $ * $FreeBSD: src/sys/net/bridgestp.c,v 1.7 2005/10/11 02:58:32 thompsa Exp $ - * $DragonFly: src/sys/net/bridge/bridgestp.c,v 1.10 2008/11/26 12:49:43 sephe Exp $ */ /* @@ -40,8 +39,6 @@ * (In English: IEEE 802.1D, Draft 17, 1998) */ -#include - #include #include #include diff --git a/sys/netbt/l2cap_socket.c b/sys/netbt/l2cap_socket.c index 06c054d906..e82264872d 100644 --- a/sys/netbt/l2cap_socket.c +++ b/sys/netbt/l2cap_socket.c @@ -1,4 +1,3 @@ -/* $DragonFly: src/sys/netbt/l2cap_socket.c,v 1.3 2008/06/20 20:52:29 aggelos Exp $ */ /* $OpenBSD: l2cap_socket.c,v 1.1 2007/06/01 02:46:11 uwe Exp $ */ /* $NetBSD: l2cap_socket.c,v 1.7 2007/04/21 06:15:23 plunky Exp $ */ @@ -32,8 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - /* load symbolic names */ #ifdef BLUETOOTH_DEBUG #define PRUREQUESTS diff --git a/sys/netbt/l2cap_upper.c b/sys/netbt/l2cap_upper.c index 8d9d169e7e..2f374622c4 100644 --- a/sys/netbt/l2cap_upper.c +++ b/sys/netbt/l2cap_upper.c @@ -1,4 +1,3 @@ -/* $DragonFly: src/sys/netbt/l2cap_upper.c,v 1.3 2008/06/20 20:52:29 aggelos Exp $ */ /* $OpenBSD: l2cap_upper.c,v 1.2 2007/10/01 16:39:30 krw Exp $ */ /* $NetBSD: l2cap_upper.c,v 1.8 2007/04/29 20:23:36 msaitoh Exp $ */ @@ -32,8 +31,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include #include #include diff --git a/sys/netbt/sco_socket.c b/sys/netbt/sco_socket.c index ae748096eb..527ac92c36 100644 --- a/sys/netbt/sco_socket.c +++ b/sys/netbt/sco_socket.c @@ -1,4 +1,3 @@ -/* $DragonFly: src/sys/netbt/sco_socket.c,v 1.3 2008/06/20 20:58:37 aggelos Exp $ */ /* $OpenBSD: sco_socket.c,v 1.1 2007/06/01 02:46:12 uwe Exp $ */ /* $NetBSD: sco_socket.c,v 1.9 2007/04/21 06:15:23 plunky Exp $ */ @@ -31,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - /* load symbolic names */ #ifdef BLUETOOTH_DEBUG #define PRUREQUESTS diff --git a/sys/netbt/sco_upper.c b/sys/netbt/sco_upper.c index 74778d3a53..657c5ec986 100644 --- a/sys/netbt/sco_upper.c +++ b/sys/netbt/sco_upper.c @@ -1,4 +1,3 @@ -/* $DragonFly: src/sys/netbt/sco_upper.c,v 1.2 2008/03/18 13:41:42 hasso Exp $ */ /* $OpenBSD: sco_upper.c,v 1.2 2007/10/01 16:39:30 krw Exp $ */ /* $NetBSD: sco_upper.c,v 1.6 2007/03/30 20:47:03 plunky Exp $ */ @@ -33,8 +32,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include - #include #include #include diff --git a/sys/platform/pc32/i386/cs5536.c b/sys/platform/pc32/i386/cs5536.c index b2765c3890..8125f410b4 100644 --- a/sys/platform/pc32/i386/cs5536.c +++ b/sys/platform/pc32/i386/cs5536.c @@ -52,7 +52,6 @@ #include "opt_cpu.h" #include "use_gpio.h" -#include #include #include diff --git a/sys/platform/pc32/i386/dump_machdep.c b/sys/platform/pc32/i386/dump_machdep.c index 2c84c336e5..5090c3ab08 100644 --- a/sys/platform/pc32/i386/dump_machdep.c +++ b/sys/platform/pc32/i386/dump_machdep.c @@ -22,10 +22,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.20 2009/12/10 03:09:35 kmacy Exp $ */ -#include - #include #include #include diff --git a/sys/platform/pc32/i386/geode.c b/sys/platform/pc32/i386/geode.c index 3afa49b7a7..4f2c49c73b 100644 --- a/sys/platform/pc32/i386/geode.c +++ b/sys/platform/pc32/i386/geode.c @@ -48,7 +48,6 @@ * */ #include "opt_cpu.h" -#include #include #include diff --git a/sys/platform/pc32/i386/minidump_machdep.c b/sys/platform/pc32/i386/minidump_machdep.c index 0d9bd63fd3..2bc24b90c6 100644 --- a/sys/platform/pc32/i386/minidump_machdep.c +++ b/sys/platform/pc32/i386/minidump_machdep.c @@ -22,10 +22,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.9 2009/05/29 21:27:12 jamie Exp $ */ -#include - #include #include #include diff --git a/sys/platform/pc32/i386/p4tcc.c b/sys/platform/pc32/i386/p4tcc.c index e97196c4e2..ff0961a9b6 100644 --- a/sys/platform/pc32/i386/p4tcc.c +++ b/sys/platform/pc32/i386/p4tcc.c @@ -37,11 +37,8 @@ * Workarounds included below. * * $FreeBSD: /repoman/r/ncvs/src/sys/i386/i386/p4tcc.c,v 1.3.2.1 2004/03/03 15:24:15 sobomax Exp $ - * $DragonFly: src/sys/platform/pc32/i386/p4tcc.c,v 1.3 2007/04/30 07:18:55 dillon Exp $ */ -#include - #include "opt_cpu.h" #include #include diff --git a/sys/platform/pc32/isa/pmtimer.c b/sys/platform/pc32/isa/pmtimer.c index 1d6d788986..75b4e5eb2f 100644 --- a/sys/platform/pc32/isa/pmtimer.c +++ b/sys/platform/pc32/isa/pmtimer.c @@ -22,11 +22,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * $DragonFly: src/sys/platform/pc32/isa/pmtimer.c,v 1.5 2005/10/28 03:25:57 dillon Exp $ */ -#include - /* * Timer device driver for power management events. * The code for suspend/resume is derived from APM device driver. diff --git a/sys/platform/pc64/isa/pmtimer.c b/sys/platform/pc64/isa/pmtimer.c index f023078d4d..3a2725ff2a 100644 --- a/sys/platform/pc64/isa/pmtimer.c +++ b/sys/platform/pc64/isa/pmtimer.c @@ -23,12 +23,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/platform/pc64/isa/pmtimer.c,v 1.1 2008/08/29 17:07:20 dillon Exp $ */ -#include - /* * Timer device driver for power management events. * The code for suspend/resume is derived from APM device driver. diff --git a/sys/platform/pc64/x86_64/dump_machdep.c b/sys/platform/pc64/x86_64/dump_machdep.c index 61003d3972..26830ad8ec 100644 --- a/sys/platform/pc64/x86_64/dump_machdep.c +++ b/sys/platform/pc64/x86_64/dump_machdep.c @@ -22,10 +22,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $ */ -#include - #include #include #include diff --git a/sys/platform/pc64/x86_64/minidump_machdep.c b/sys/platform/pc64/x86_64/minidump_machdep.c index 4727d7cfca..facacbc5d9 100644 --- a/sys/platform/pc64/x86_64/minidump_machdep.c +++ b/sys/platform/pc64/x86_64/minidump_machdep.c @@ -22,10 +22,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $ */ -#include - #include #include #include diff --git a/sys/vfs/isofs/cd9660/cd9660_iconv/cd9660_iconv.c b/sys/vfs/isofs/cd9660/cd9660_iconv/cd9660_iconv.c index d4150dfcaa..73cc80066d 100644 --- a/sys/vfs/isofs/cd9660/cd9660_iconv/cd9660_iconv.c +++ b/sys/vfs/isofs/cd9660/cd9660_iconv/cd9660_iconv.c @@ -22,10 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/fs/cd9660/cd9660_iconv.c,v 1.2 2007/02/11 13:54:25 rodrigc Exp $ */ -#include - #include #include #include diff --git a/sys/vfs/msdosfs/msdosfs_iconv/msdosfs_iconv.c b/sys/vfs/msdosfs/msdosfs_iconv/msdosfs_iconv.c index f33c07bcbd..7ee52355d6 100644 --- a/sys/vfs/msdosfs/msdosfs_iconv/msdosfs_iconv.c +++ b/sys/vfs/msdosfs/msdosfs_iconv/msdosfs_iconv.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * __FBSDID("$FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.4.8.1 2009/04/15 03:14:26 kensmith Exp $"); + * + * $FreeBSD: src/sys/fs/msdosfs/msdosfs_iconv.c,v 1.4.8.1 2009/04/15 03:14:26 kensmith Exp $ */ -#include - #include #include #include diff --git a/sys/vfs/ntfs/ntfs_iconv/ntfs_iconv.c b/sys/vfs/ntfs/ntfs_iconv/ntfs_iconv.c index 23d906f3bc..0850cd6197 100644 --- a/sys/vfs/ntfs/ntfs_iconv/ntfs_iconv.c +++ b/sys/vfs/ntfs/ntfs_iconv/ntfs_iconv.c @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * * $FreeBSD: src/sys/fs/ntfs/ntfs_iconv.c,v 1.1 2003/09/26 20:26:23 fjoe Exp $ */ -#include - #include #include #include -- 2.41.0