[src/trunk]: src/sys/dev/cardbus nuke some final __BROKEN_INDIRECT_CONFIG bit...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d82a4b7e5875
branches:  trunk
changeset: 494116:d82a4b7e5875
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sun Jul 02 06:25:46 2000 +0000

description:
nuke some final __BROKEN_INDIRECT_CONFIG bits that weren't caught by
unifdef last time.  (bloody things just won't stay dead!)

diffstat:

 sys/dev/cardbus/cardbus.c  |  7 +------
 sys/dev/cardbus/cardslot.c |  6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diffs (44 lines):

diff -r 4096925c3cd4 -r d82a4b7e5875 sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Sun Jul 02 05:43:43 2000 +0000
+++ b/sys/dev/cardbus/cardbus.c Sun Jul 02 06:25:46 2000 +0000
@@ -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 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 -r 4096925c3cd4 -r d82a4b7e5875 sys/dev/cardbus/cardslot.c
--- a/sys/dev/cardbus/cardslot.c        Sun Jul 02 05:43:43 2000 +0000
+++ b/sys/dev/cardbus/cardslot.c        Sun Jul 02 06:25:46 2000 +0000
@@ -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));