First step towards making loadable modules independent of having

pccard in the kernel for those drivers with pccard attachments.  This
makes the compat layer a little larger by introducing some inlines,
but should almost make it possible to have independent attachments.
The pccard_match function are the only one left, which I will take
care of shortly.

1 files changed, 6 insertions, 4 deletions

diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c
index c610a8b..5e5d618 100644
--- a/sys/pccard/pccard_nbk.c
+++ b/sys/pccard/pccard_nbk.c
@@ -80,14 +80,14 @@ devclass_t	pccard_devclass;
 /*
  * glue for NEWCARD/OLDCARD compat layer
  */
-int
-pccard_compat_probe(device_t dev)
+static int
+pccard_compat_do_probe(device_t bus, device_t dev)
 {
 	return (CARD_COMPAT_PROBE(dev));
 }
 
-int
-pccard_compat_attach(device_t dev)
+static int
+pccard_compat_do_attach(device_t bus, device_t dev)
 {
 	return (CARD_COMPAT_ATTACH(dev));
 }
@@ -376,6 +376,8 @@ static device_method_t pccard_methods[] = {
 	DEVMETHOD(card_get_function,	pccard_get_function),
 	DEVMETHOD(card_activate_function, pccard_activate_function),
 	DEVMETHOD(card_deactivate_function, pccard_deactivate_function),
+	DEVMETHOD(card_compat_do_probe, pccard_compat_do_probe),
+	DEVMETHOD(card_compat_do_attach, pccard_compat_do_attach),
 
 	{ 0, 0 }
 };