--- linux/drivers/net/8390.c.dist-2.2.11-pre7 Thu May 6 17:02:34 1999
+++ linux/drivers/net/8390.c Mon Aug 9 21:18:00 1999
@@ -1089,7 +1089,6 @@
int start_page)
{
int e8390_base = dev->base_addr;
- struct ei_device *ei_local = (struct ei_device *) dev->priv;
outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);
--- linux/fs/qnx4/fsync.c.dist-2.2.11-pre7 Tue Sep 1 13:43:13 1998
+++ linux/fs/qnx4/fsync.c Mon Aug 9 21:34:58 1999
@@ -122,6 +122,7 @@
return err;
}
+#if 0 /* This function isn't used anywhere HvB 19990808 */
static int sync_dindirect(struct inode *inode, unsigned short *diblock,
int wait)
{
@@ -145,6 +146,7 @@
brelse(dind_bh);
return err;
}
+#endif
int qnx4_sync_file(struct file *file, struct dentry *dentry)
{
--- linux/fs/qnx4/dir.c.dist-2.2.11-pre7 Tue Jul 20 22:22:51 1999
+++ linux/fs/qnx4/dir.c Mon Aug 9 21:32:45 1999
@@ -43,7 +43,7 @@
bh = bread(inode->i_dev, blknum, QNX4_BLOCK_SIZE);
if(bh==NULL)
{
- printk(KERN_ERR "qnx4_readdir: bread failed (%d)\n", blknum);
+ printk(KERN_ERR "qnx4_readdir: bread failed (%ld)\n", blknum);
break;
}
i = (filp->f_pos - (((filp->f_pos >> 6) >> 3) << 9)) & 0x3f;
--- linux/net/ipv4/tcp.c.dist-2.2.11-pre7 Sun Aug 8 20:57:22 1999
+++ linux/net/ipv4/tcp.c Mon Aug 9 21:08:38 1999
@@ -731,7 +731,6 @@
static int wait_for_buffer(struct sock *sk)
{
struct wait_queue wait = { current, NULL };
- int success = 0;
release_sock(sk);
add_wait_queue(sk->sleep, &wait);
-- Horst von Brand vonbrand@sleipnir.valparaiso.cl Casilla 9G, Viņa del Mar, Chile +56 32 672616- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/