Author: mguevara Date: Wed Dec 13 18:05:36 2006 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - 2.6.19 work in progress
---- Files affected: SOURCES: linux-2.6-sk98lin-8.36.1.3.patch (1.1.2.4 -> 1.1.2.5) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-sk98lin-8.36.1.3.patch diff -u SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.4 SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.5 --- SOURCES/linux-2.6-sk98lin-8.36.1.3.patch:1.1.2.4 Tue Dec 12 12:29:16 2006 +++ SOURCES/linux-2.6-sk98lin-8.36.1.3.patch Wed Dec 13 19:05:30 2006 @@ -40,8 +40,8 @@ +# History: +# +# $Log$ -+# Revision 1.1.2.4 2006/12/12 11:29:16 mguevara -+# - 2.6.19 ready ++# Revision 1.1.2.5 2006/12/13 18:05:30 mguevara ++# - 2.6.19 work in progress +# +# Revision 1.9.2.1 2005/04/11 09:01:18 mlindner +# Fix: Copyright year changed @@ -13982,7 +13982,7 @@ +extern void SkY2AllocateRxBuffers(SK_AC *pAC,SK_IOC IoC,int Port); +extern void SkY2FreeRxBuffers(SK_AC *pAC,SK_IOC IoC,int Port); +extern void SkY2FreeTxBuffers(SK_AC *pAC,SK_IOC IoC,int Port); -+extern SkIsrRetVar SkY2Isr(int irq,void *dev_id,struct pt_regs *ptregs); ++extern SkIsrRetVar SkY2Isr(int irq,void *dev_id /*,struct pt_regs *ptregs*/ ); +extern int SkY2Xmit(struct sk_buff *skb,struct SK_NET_DEVICE *dev); +extern void SkY2PortStop(SK_AC *pAC,SK_IOC IoC,int Port,int Dir,int RstMode); +extern void SkY2PortStart(SK_AC *pAC,SK_IOC IoC,int Port); @@ -16263,9 +16263,9 @@ + if (!CHIP_ID_YUKON_2(pAC)) { + /* Handle the GENESIS Isr */ + if (pAC->GIni.GIMacsFound == 2) -+ SkGeIsr(dev->irq, dev, NULL); ++ SkGeIsr(dev->irq, dev); + else -+ SkGeIsrOnePort(dev->irq, dev, NULL); ++ SkGeIsrOnePort(dev->irq, dev); + } else { + /* Handle the Yukon2 Isr */ + SkY2Isr(dev->irq, dev, NULL); @@ -42327,8 +42327,8 @@ + */ +SkIsrRetVar SkY2Isr ( +int irq, /* the irq we have received (might be shared!) */ -+void *dev_id, /* current device id */ -+struct pt_regs *ptregs) /* not used by our driver */ ++void *dev_id /* current device id */ ++/* */ +{ + struct SK_NET_DEVICE *dev = (struct SK_NET_DEVICE *)dev_id; + DEV_NET *pNet = (DEV_NET*) dev->priv; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/linux-2.6-sk98lin-8.36.1.3.patch?r1=1.1.2.4&r2=1.1.2.5&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit