Module Name: src
Committed By: dyoung
Date: Thu Nov 12 19:24:06 UTC 2009
Modified Files:
src/sys/dev/pcmcia: aic_pcmcia.c
Log Message:
Don't use the superfluous activation hook.
Cosmetic: while I'm here, join two lines.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pcmcia/aic_pcmcia.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/pcmcia/aic_pcmcia.c
diff -u src/sys/dev/pcmcia/aic_pcmcia.c:1.42 src/sys/dev/pcmcia/aic_pcmcia.c:1.43
--- src/sys/dev/pcmcia/aic_pcmcia.c:1.42 Tue Sep 22 13:20:36 2009
+++ src/sys/dev/pcmcia/aic_pcmcia.c Thu Nov 12 19:24:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_pcmcia.c,v 1.42 2009/09/22 13:20:36 tsutsui Exp $ */
+/* $NetBSD: aic_pcmcia.c,v 1.43 2009/11/12 19:24:06 dyoung Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.42 2009/09/22 13:20:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.43 2009/11/12 19:24:06 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@
static int aic_pcmcia_enable(device_t, int);
CFATTACH_DECL_NEW(aic_pcmcia, sizeof(struct aic_pcmcia_softc),
- aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, aic_activate);
+ aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, NULL);
static const struct pcmcia_product aic_pcmcia_products[] = {
{ PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460,
@@ -119,8 +119,7 @@
error = pcmcia_function_configure(pf, aic_pcmcia_validate_config);
if (error) {
- aprint_error_dev(self, "configure failed, error=%d\n",
- error);
+ aprint_error_dev(self, "configure failed, error=%d\n", error);
return;
}
