Checkin my first batch of New Mexico changes:

o minor whitespace things (bad because this is also a functional commit)
o Backport reading in of CIS entries from the driver level.

1 files changed, 7 insertions, 7 deletions

diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index a06f266..1cfa96c 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -73,8 +73,8 @@ SYSCTL_NODE(_machdep, OID_AUTO, pccard, CTLFLAG_RW, 0, "pccard");
 
 static int pcic_resume_reset = 1;
 
-SYSCTL_INT(_machdep_pccard, OID_AUTO, pcic_resume_reset, CTLFLAG_RW, 
-	&pcic_resume_reset, 0, "");
+SYSCTL_INT(_machdep_pccard, OID_AUTO, pcic_resume_reset, CTLFLAG_RW,
+    &pcic_resume_reset, 0, "");
 
 #define	PCCARD_MEMSIZE	(4*1024)
 
@@ -132,10 +132,10 @@ power_off_slot(void *arg)
 	struct slot *slt = (struct slot *)arg;
 	int s;
 
-	/* 
+	/*
 	 * The following will generate an interrupt.  So, to hold off
 	 * the interrupt unitl after disable runs so that we can get rid
-	 * rid of the interrupt before it becomes unsafe to touch the 
+	 * rid of the interrupt before it becomes unsafe to touch the
 	 * device.
 	 */
 	s = splhigh();
@@ -251,12 +251,12 @@ allocate_driver(struct slot *slt, struct dev_desc *desc)
 		goto err;
 	if (irq)
 		err = bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1);
-	if (err) 
+	if (err)
 		goto err;
 	if (desc->memsize) {
-		err = bus_set_resource(child, SYS_RES_MEMORY, 0, desc->mem, 
+		err = bus_set_resource(child, SYS_RES_MEMORY, 0, desc->mem,
 		    desc->memsize);
-		if (err) 
+		if (err)
 			goto err;
 	}
 	err = device_probe_and_attach(child);