diff options
| author | nate <nate@FreeBSD.org> | 1997-10-26 04:36:24 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1997-10-26 04:36:24 +0000 |
| commit | c68183d0b8cb8cb595c0fac05b6d989132543595 (patch) | |
| tree | 3e3880b90341465871c326ce768b275780757e2d /sys/i386/isa/if_zp.c | |
| parent | bc21da1f3f59930a96cd6829bfaf0147d28b7754 (diff) | |
| download | FreeBSD-src-c68183d0b8cb8cb595c0fac05b6d989132543595.zip FreeBSD-src-c68183d0b8cb8cb595c0fac05b6d989132543595.tar.gz | |
- Do a bunch of gratuitous changes intended to make the code easier to
follow.
* Rename/reorder all of the pccard structures, change many of the member
names to be descriptive, and follow more closely other 'bus' drivers
naming schemes.
* Rename a bunch of parameter and local variable names to be more
consistant in the code.
* Renamed the PCCARD 'crd' device to be the 'card' device
* KNF and make the code consistant where it was obvious.
* ifdef'd out some unused code
Diffstat (limited to 'sys/i386/isa/if_zp.c')
| -rw-r--r-- | sys/i386/isa/if_zp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index 7c9ecb3..5126c81 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.38 1997/07/20 14:10:02 bde Exp $ + * $Id: if_zp.c,v 1.39 1997/09/21 21:41:14 gibbs Exp $ */ /*- * TODO: @@ -101,9 +101,9 @@ */ /* XXX - Don't mix different PCCARD support code */ -#include "crd.h" +#include "card.h" #include "pcic.h" -#if NCRD > 0 || NPCIC > 0 +#if NCARD > 0 || NPCIC > 0 #ifndef LINT_PCCARD_HACK #error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed" #else |
