Minor nits merged from my stable tree:

o kill blank line that I introduced in cardinfo.h
o Delete unused variable wasinactive.
o return 0 from pccard_resume.
o Set the state and lastsate initially to be empty.
o move comment above code for interrupt dispatching.
o Powerstate interface is now available as of 430002, not 500000 (note that
  this change will be not 100% correct since the power state stuff didn't
  enter current until well after 500000, but it is good enough for the two
  branche we have going now).

1 files changed, 1 insertions, 0 deletions

diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index 460f123..397ab63 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -349,6 +349,7 @@ pcic_attach(device_t dev)
 
 		/* Check for changes */
 		pcic_setb(sp, PCIC_POWER, PCIC_PCPWRE | PCIC_DISRST);
+		sp->slt->laststate = sp->slt->state = empty;
 		pcic_do_stat_delta(sp);
 	}