diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /include/linux/hdlc.h | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/hdlc.h')
| -rw-r--r-- | include/linux/hdlc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hdlc.h b/include/linux/hdlc.h index df695e9ae327..4513f9e40937 100644 --- a/include/linux/hdlc.h +++ b/include/linux/hdlc.h | |||
| @@ -188,7 +188,7 @@ int hdlc_x25_ioctl(struct net_device *dev, struct ifreq *ifr); | |||
| 188 | int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); | 188 | int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); |
| 189 | 189 | ||
| 190 | /* Must be used by hardware driver on module startup/exit */ | 190 | /* Must be used by hardware driver on module startup/exit */ |
| 191 | int register_hdlc_device(struct net_device *dev); | 191 | #define register_hdlc_device(dev) register_netdev(dev) |
| 192 | void unregister_hdlc_device(struct net_device *dev); | 192 | void unregister_hdlc_device(struct net_device *dev); |
| 193 | 193 | ||
| 194 | struct net_device *alloc_hdlcdev(void *priv); | 194 | struct net_device *alloc_hdlcdev(void *priv); |