diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 03:54:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 03:54:57 -0700 |
| commit | f3ed32e268fdcb549882b6e2ce9ee8a43d5134e9 (patch) | |
| tree | b0c2bcc792e72d1676f4a7f192f2c6973c8b8d06 /include | |
| parent | 4bc7073e0eecb3b3d3a95b1070cd00d7b6ebbc7a (diff) | |
| parent | 706245bbc5a41fd887c3da129ca33f5446f79d21 (diff) | |
Merge bk://kernel.bkbits.net/acme/net-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cyclomx.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index 6e09c3670de0..a19aeebe7192 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h @@ -1,3 +1,5 @@ +#ifndef _CYCLOMX_H +#define _CYCLOMX_H /* * cyclomx.h Cyclom 2X WAN Link Driver. * User-level API definitions. @@ -21,8 +23,6 @@ * 1998/12/27 acme cleanup: PACKED not needed * 1998/08/08 acme Version 0.0.1 */ -#ifndef _CYCLOMX_H -#define _CYCLOMX_H #include <linux/config.h> #include <linux/wanrouter.h> @@ -47,7 +47,6 @@ struct cycx_device { char devname[WAN_DRVNAME_SZ+1]; /* card name */ cycxhw_t hw; /* hardware configuration */ struct wan_device wandev; /* WAN device data space */ - u32 open_cnt; /* number of open interfaces */ u32 state_tick; /* link state timestamp */ spinlock_t lock; char in_isr; /* interrupt-in-service flag */ @@ -72,8 +71,6 @@ struct cycx_device { }; /* Public Functions */ -void cyclomx_mod_inc_use_count(struct cycx_device *card); -void cyclomx_mod_dec_use_count(struct cycx_device *card); void cyclomx_set_state(struct cycx_device *card, int state); #ifdef CONFIG_CYCLOMX_X25 |