Module Name: src Committed By: mrg Date: Sat Sep 24 23:54:49 UTC 2016
Modified Files: src/sys/dev/cardbus: cardslot.c Log Message: weak alias some pcmcia functions (to an returns error function) so this links when pcmcia isn't in the kernel. PR#7253. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/cardbus/cardslot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/cardbus/cardslot.c diff -u src/sys/dev/cardbus/cardslot.c:1.55 src/sys/dev/cardbus/cardslot.c:1.56 --- src/sys/dev/cardbus/cardslot.c:1.55 Sat Oct 12 16:49:00 2013 +++ src/sys/dev/cardbus/cardslot.c Sat Sep 24 23:54:49 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: cardslot.c,v 1.55 2013/10/12 16:49:00 christos Exp $ */ +/* $NetBSD: cardslot.c,v 1.56 2016/09/24 23:54:49 mrg Exp $ */ /* * Copyright (c) 1999 and 2000 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.55 2013/10/12 16:49:00 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.56 2016/09/24 23:54:49 mrg Exp $"); #include "opt_cardslot.h" @@ -56,6 +56,16 @@ __KERNEL_RCSID(0, "$NetBSD: cardslot.c,v #define DPRINTF(a) #endif +int pcmcia_error(device_t); +int +pcmcia_error(device_t dev) +{ + + return 1; +} +__weak_alias(pcmcia_card_attach, pcmcia_error); +__weak_alias(pcmcia_card_deactivate, pcmcia_error); +__weak_alias(pcmcia_card_detach, pcmcia_error); STATIC void cardslotchilddet(device_t, device_t);