[src/trunk]: src/sys/dev/cardbus it is sufficient to include "locators.h" in ...

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

details:   https://anonhg.NetBSD.org/src/rev/3028e4879819
branches:  trunk
changeset: 569548:3028e4879819
user:      drochner <drochner%NetBSD.org@localhost>
date:      Mon Aug 23 18:21:51 2004 +0000

description:
it is sufficient to include "locators.h" in cardbus.c

diffstat:

 sys/dev/cardbus/cardbus.c    |   6 ++++--
 sys/dev/cardbus/cardbusvar.h |  13 +------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diffs (54 lines):

diff -r b4b9f1825eee -r 3028e4879819 sys/dev/cardbus/cardbus.c
--- a/sys/dev/cardbus/cardbus.c Mon Aug 23 17:52:45 2004 +0000
+++ b/sys/dev/cardbus/cardbus.c Mon Aug 23 18:21:51 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbus.c,v 1.54 2004/08/23 17:52:45 drochner Exp $    */
+/*     $NetBSD: cardbus.c,v 1.55 2004/08/23 18:21:51 drochner Exp $    */
 
 /*
  * Copyright (c) 1997, 1998, 1999 and 2000
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.54 2004/08/23 17:52:45 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.55 2004/08/23 18:21:51 drochner Exp $");
 
 #include "opt_cardbus.h"
 
@@ -58,6 +58,8 @@
 
 #include <dev/pcmcia/pcmciareg.h>
 
+#include "locators.h"
+
 #if defined CARDBUS_DEBUG
 #define STATIC
 #define DPRINTF(a) printf a
diff -r b4b9f1825eee -r 3028e4879819 sys/dev/cardbus/cardbusvar.h
--- a/sys/dev/cardbus/cardbusvar.h      Mon Aug 23 17:52:45 2004 +0000
+++ b/sys/dev/cardbus/cardbusvar.h      Mon Aug 23 18:21:51 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cardbusvar.h,v 1.28 2004/08/23 17:52:45 drochner Exp $ */
+/*     $NetBSD: cardbusvar.h,v 1.29 2004/08/23 18:21:51 drochner Exp $ */
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -304,17 +304,6 @@
 #define CARDBUS_VPPMASK 0x00f0
 
 
-#include "locators.h"
-
-/*
- * Locators devices that attach to 'cardbus', as specified to config.
- */
-#define cardbuscf_dev cf_loc[CARDBUSCF_DEV]
-#define CARDBUS_UNK_DEV CARDBUSCF_DEV_DEFAULT
-
-#define cardbuscf_function cf_loc[CARDBUSCF_FUNCTION]
-#define CARDBUS_UNK_FUNCTION CARDBUSCF_FUNCTION_DEFAULT
-
 int cardbus_attach_card __P((struct cardbus_softc *));
 void cardbus_detach_card __P((struct cardbus_softc *));
 void *cardbus_intr_establish __P((cardbus_chipset_tag_t, cardbus_function_tag_t,