Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/cardbus weak alias some pcmcia functions (to an retu...
details: https://anonhg.NetBSD.org/src/rev/29e6f55833bf
branches: trunk
changeset: 347952:29e6f55833bf
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Sep 24 23:54:49 2016 +0000
description:
weak alias some pcmcia functions (to an returns error function) so this
links when pcmcia isn't in the kernel. PR#7253.
diffstat:
sys/dev/cardbus/cardslot.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diffs (35 lines):
diff -r bb489db188cb -r 29e6f55833bf sys/dev/cardbus/cardslot.c
--- a/sys/dev/cardbus/cardslot.c Sat Sep 24 23:15:26 2016 +0000
+++ b/sys/dev/cardbus/cardslot.c Sat Sep 24 23:54:49 2016 +0000
@@ -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 @@
#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);
Home |
Main Index |
Thread Index |
Old Index