---

yaml --- r: 134590 b: refs/heads/master c: 416c6f9 h: refs/heads/master v: v3
git-mirror · Feb 18, 2009 · b5eea7d · b5eea7d
1 parent 91644db
commit b5eea7d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00137dad17707f0d14dbf7e193761220f1c2fe03
+refs/heads/master: 416c6f90f8a107ccae3788bb9798d10a2dac9ed0
diff --git a/trunk/drivers/net/ni65.c b/trunk/drivers/net/ni65.c
@@ -481,8 +481,9 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr)
 	else {
 		if(dev->dma == 0) {
 		/* 'stuck test' from lance.c */
-			long dma_channels = ((inb(DMA1_STAT_REG) >> 4) & 0x0f) |
-					    (inb(DMA2_STAT_REG) & 0xf0);
+			unsigned long dma_channels =
+				((inb(DMA1_STAT_REG) >> 4) & 0x0f)
+				| (inb(DMA2_STAT_REG) & 0xf0);
 			for(i=1;i<5;i++) {
 				int dma = dmatab[i];
 				if(test_bit(dma,&dma_channels) || request_dma(dma,"ni6510"))