Merged revisions 1924 via svnmerge from

https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1924 | kpfleming | 2007-01-23 09:39:43 -0600 (Tue, 23 Jan 2007) | 10 lines

Merged revisions 1923 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1923 | kpfleming | 2007-01-23 09:39:12 -0600 (Tue, 23 Jan 2007) | 2 lines

use the proper function prototype for 2.6 kernels

........

................


git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1925 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 4 insertions, 0 deletions

diff --git a/ztd-eth.c b/ztd-eth.c
index c1b06f2..3bcc880 100644
--- a/ztd-eth.c
+++ b/ztd-eth.c
@@ -86,7 +86,11 @@ struct zt_span *ztdeth_getspan(unsigned char *addr, unsigned short subaddr)
 	return span;
 }
 
+#if defined(LINUX26)
+static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
+#else
 static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
+#endif
 {
 	struct zt_span *span;
 	struct ztdeth_header *zh;