aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/aic7xxx/ahc_pci.c6
-rw-r--r--sys/dev/de/if_de.c4
-rw-r--r--sys/dev/ed/if_ed_pci.c6
-rw-r--r--sys/dev/fxp/if_fxp.c6
-rw-r--r--sys/dev/pci/pcivar.h4
-rw-r--r--sys/dev/vx/if_vx_pci.c4
6 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 6c26c09a8ca1..fb53e9d107ea 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: ahc_pci.c,v 1.2 1998/10/07 03:40:51 gibbs Exp $
+ * $Id: ahc_pci.c,v 1.3 1998/12/07 21:58:45 archie Exp $
*/
#include <pci.h>
@@ -138,7 +138,7 @@ static u_int8_t read_brdctl(struct ahc_softc *ahc);
static struct ahc_softc *first_398X;
-static char* ahc_pci_probe(pcici_t tag, pcidi_t type);
+static const char* ahc_pci_probe(pcici_t tag, pcidi_t type);
static void ahc_pci_attach(pcici_t config_id, int unit);
/* Exported for use in the ahc_intr routine */
@@ -154,7 +154,7 @@ static struct pci_device ahc_pci_driver = {
DATA_SET (pcidevice_set, ahc_pci_driver);
-static char*
+static const char*
ahc_pci_probe (pcici_t tag, pcidi_t type)
{
switch (type) {
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 2dce9a50c66d..0a1b599d8f3f 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $ */
-/* $Id: if_de.c,v 1.90 1998/11/06 02:13:13 peter Exp $ */
+/* $Id: if_de.c,v 1.91 1998/11/28 00:25:32 msmith Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -5310,7 +5310,7 @@ tulip_pci_shutdown(
}
#endif
-static char*
+static const char*
tulip_pci_probe(
pcici_t config_id,
pcidi_t device_id)
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index d284ee6074e0..e14a96c50abd 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,7 +17,7 @@
* 4. Modifications may be freely made to this file if the above conditions
* are met.
*
- * $Id: if_ed_p.c,v 1.12 1998/02/27 22:29:36 se Exp $
+ * $Id: if_ed_p.c,v 1.13 1998/03/17 10:54:23 danny Exp $
*/
#include "pci.h"
@@ -51,7 +51,7 @@ static struct _pcsid
extern void *ed_attach_NE2000_pci __P((int, int));
-static char* ed_pci_probe __P((pcici_t tag, pcidi_t type));
+static const char* ed_pci_probe __P((pcici_t tag, pcidi_t type));
static void ed_pci_attach __P((pcici_t config_id, int unit));
static u_long ed_pci_count = NED;
@@ -66,7 +66,7 @@ static struct pci_device ed_pci_driver = {
DATA_SET (pcidevice_set, ed_pci_driver);
-static char*
+static const char*
ed_pci_probe (pcici_t tag, pcidi_t type)
{
struct _pcsid *ep =pci_ids;
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 1a1c1518fe13..1908cb6eff70 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_fxp.c,v 1.57 1998/10/11 06:28:54 dg Exp $
+ * $Id: if_fxp.c,v 1.58 1998/10/22 02:00:49 dg Exp $
*/
/*
@@ -485,7 +485,7 @@ fxp_ether_ioctl(ifp, cmd, data)
#else /* __FreeBSD__ */
static u_long fxp_count;
-static char *fxp_probe __P((pcici_t, pcidi_t));
+static const char *fxp_probe __P((pcici_t, pcidi_t));
static void fxp_attach __P((pcici_t, int));
static void fxp_shutdown __P((int, void *));
@@ -502,7 +502,7 @@ DATA_SET(pcidevice_set, fxp_device);
/*
* Return identification string if this is device is ours.
*/
-static char *
+static const char *
fxp_probe(config_id, device_id)
pcici_t config_id;
pcidi_t device_id;
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 13e9991eefc3..75f48a8bc6d8 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pcivar.h,v 1.21 1998/09/15 08:21:09 gibbs Exp $
+ * $Id: pcivar.h,v 1.22 1998/10/06 14:18:40 dfr Exp $
*
*/
@@ -199,7 +199,7 @@ extern int pci_mechanism;
struct pci_device {
char* pd_name;
- char* (*pd_probe ) (pcici_t tag, pcidi_t type);
+ const char* (*pd_probe ) (pcici_t tag, pcidi_t type);
void (*pd_attach) (pcici_t tag, int unit);
u_long *pd_count;
int (*pd_shutdown) (int, int);
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index f4e98ac0a3ff..8eb3d7505e11 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -47,7 +47,7 @@
#include <dev/vx/if_vxreg.h>
static void vx_pci_shutdown(int, void *);
-static char *vx_pci_probe(pcici_t, pcidi_t);
+static const char *vx_pci_probe(pcici_t, pcidi_t);
static void vx_pci_attach(pcici_t, int unit);
static void
@@ -59,7 +59,7 @@ vx_pci_shutdown(
vxfree(sc);
}
-static char*
+static const char*
vx_pci_probe(
pcici_t config_id,
pcidi_t device_id)