diff options
author | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2004-07-28 13:35:55 +0000 |
---|---|---|
committer | markster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2004-07-28 13:35:55 +0000 |
commit | d178c59876ebc7e620b8829f6d07c715fa64373b (patch) | |
tree | c499bed6671e21136d53530bdaf415a6b1d3588f /zaptel.h | |
parent | 12b723850e1c9a5519d1d8ca933a3e283a3f0eae (diff) |
Make data build on Linux 2.6
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@443 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel.h')
-rwxr-xr-x | zaptel.h | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -44,6 +44,10 @@ #endif #include <linux/fs.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#define LINUX26 +#endif + #include "ecdis.h" #include "fasthdlc.h" #endif @@ -878,7 +882,11 @@ struct zt_tone_state { #ifdef CONFIG_ZAPATA_NET struct zt_hdlc { +#ifdef LINUX26 + struct net_device *netdev; +#else hdlc_device netdev; +#endif struct zt_chan *chan; }; #endif @@ -1415,10 +1423,6 @@ static inline short zt_txtone_nextsample(struct zt_chan *ss) #endif /* CONFIG_CALC_XLAW */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -#define LINUX26 -#endif - #endif /* __KERNEL__ */ #endif /* _LINUX_ZAPTEL_H */ |