diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-20 04:55:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-20 04:55:06 -0700 |
| commit | 12a7f674a5c1df7685c2e92e833bc9fc9a6ac795 (patch) | |
| tree | 5caef094aea8851191eb75abc10d8f473394ea3a /include/linux | |
| parent | a67283b7658e581b4959ebd73eabd4d14c66c65f (diff) | |
| parent | 223a0d0b8398a9da309e0b724569a0315166cbf7 (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/linux')
| -rw-r--r-- | include/linux/cyclomx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index c8f4173cc4d1..d84bc68e2af7 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h @@ -71,10 +71,10 @@ struct cycx_device { }; /* Public Functions */ -void cyclomx_set_state(struct cycx_device *card, int state); +void cycx_set_state(struct cycx_device *card, int state); #ifdef CONFIG_CYCLOMX_X25 -int cyx_init(struct cycx_device *card, wandev_conf_t *conf); +int cycx_x25_wan_init(struct cycx_device *card, wandev_conf_t *conf); #endif #endif /* __KERNEL__ */ #endif /* _CYCLOMX_H */ |