summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2005-10-08 18:32:29 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2005-10-08 18:32:29 +0000
commit07ae726f07ae1bb67f1feb643b199edb0b1d37dd (patch)
tree35c91a805e5797abb0268f90d3f3b0ed38c24d94 /sys/dev
parent21361e138a33251e97e7542a918a423a8ec0c68e (diff)
ANSI function decs (thorpej via NetBSD), remove trailing whitespace
(perry via NetBSD). Note we are now sync'd up to latest (r1.18) NetBSD source.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/siop_pci.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c
index 1556cd13d2f..af2ef73dd19 100644
--- a/sys/dev/pci/siop_pci.c
+++ b/sys/dev/pci/siop_pci.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: siop_pci.c,v 1.5 2002/11/16 04:37:29 krw Exp $ */
-/* $NetBSD: siop_pci.c,v 1.14 2002/10/02 16:51:54 thorpej Exp $ */
+/* $OpenBSD: siop_pci.c,v 1.6 2005/10/08 18:32:28 krw Exp $ */
+/* $NetBSD: siop_pci.c,v 1.18 2005/06/28 00:28:42 thorpej Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -21,7 +21,7 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
@@ -60,10 +60,7 @@ struct cfattach siop_pci_ca = {
};
int
-siop_pci_match(parent, match, aux)
- struct device *parent;
- void *match;
- void *aux;
+siop_pci_match( struct device *parent, void *match, void *aux)
{
struct pci_attach_args *pa = aux;
const struct siop_product_desc *pp;
@@ -76,9 +73,7 @@ siop_pci_match(parent, match, aux)
}
void
-siop_pci_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+siop_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct pci_attach_args *pa = aux;
struct siop_pci_softc *sc = (struct siop_pci_softc *)self;