summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>2000-07-02 06:25:46 +0000
committercgd <cgd@NetBSD.org>2000-07-02 06:25:46 +0000
commit1ce8331ad92ab47c7c73f99a97b4a7806727f2d0 (patch)
tree464cc037aee40d657e6f3fd7f0d616c57503f667 /sys/dev
parent0b9c36b715f3010814f325af74d71322c818377b (diff)
nuke some final __BROKEN_INDIRECT_CONFIG bits that weren't caught by
unifdef last time. (bloody things just won't stay dead!)
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cardbus/cardbus.c7
-rw-r--r--sys/dev/cardbus/cardslot.c6
2 files changed, 2 insertions, 11 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 3499c20d75b..edac41b630a 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.26 2000/06/16 23:41:33 cgd Exp $ */
+/* $NetBSD: cardbus.c,v 1.27 2000/07/02 06:25:46 cgd Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -68,13 +68,8 @@ STATIC void cardbusattach __P((struct device *, struct device *, void *));
/* STATIC int cardbusprint __P((void *, const char *)); */
int cardbus_attach_card __P((struct cardbus_softc *));
-#if !defined __BROKEN_INDIRECT_CONFIG
STATIC int cardbusmatch __P((struct device *, struct cfdata *, void *));
static int cardbussubmatch __P((struct device *, struct cfdata *, void *));
-#else
-STATIC int cardbusmatch __P((struct device *, void *, void *));
-static int cardbussubmatch __P((struct device *, void *, void *));
-#endif
static int cardbusprint __P((void *, const char *));
typedef void (*tuple_decode_func)(u_int8_t*, int, void*);
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index cb6a8c571c4..75e29cde5e1 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.10 2000/06/16 23:41:33 cgd Exp $ */
+/* $NetBSD: cardslot.c,v 1.11 2000/07/02 06:25:46 cgd Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -64,11 +64,7 @@
STATIC void cardslotattach __P((struct device *, struct device *, void *));
-#if !defined __BROKEN_INDIRECT_CONFIG
STATIC int cardslotmatch __P((struct device *, struct cfdata *, void *));
-#else
-STATIC int cardslotmatch __P((struct device *, void *, void *));
-#endif
static void create_slot_manager __P((void *));
static void cardslot_event_thread __P((void *arg));