---

yaml
---
r: 3732
b: refs/heads/master
c: 6efd936
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c903e41e67046e7f52bbc404bd5aa654d12540cc
+refs/heads/master: 6efd936046b123303ace4330fd2f26195ad7b1c4

trunk/drivers/ide/ide-disk.c

@@ -119,6 +119,10 @@ static int lba_capacity_is_ok (struct hd_driveid *id)
 {
 	unsigned long lba_sects, chs_sects, head, tail;
 
+	/* No non-LBA info .. so valid! */
+	if (id->cyls == 0)
+		return 1;
+
 	/*
 	 * The ATA spec tells large drives to return
 	 * C/H/S = 16383/16/63 independent of their size.

trunk/drivers/net/amd8111e.c

@@ -87,7 +87,6 @@ Revision History:
 #include <linux/if_vlan.h>
 #include <linux/ctype.h>	
 #include <linux/crc32.h>
-#include <linux/dma-mapping.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -2007,11 +2006,12 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
 	}
 
 	/* Initialize DMA */
-	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) < 0) {
+	if(!pci_dma_supported(pdev, 0xffffffff)){
 		printk(KERN_ERR "amd8111e: DMA not supported,"
 			"exiting.\n");
-		goto err_free_reg;
-	}
+		goto  err_free_reg;
+	} else
+		pdev->dma_mask = 0xffffffff;
 
 	reg_addr = pci_resource_start(pdev, 0);
 	reg_len = pci_resource_len(pdev, 0);

trunk/drivers/net/at1700.c

@@ -34,6 +34,10 @@
 	only is it difficult to detect, it also moves around in I/O space in
 	response to inb()s from other device probes!
 */
+/*
+	99/03/03  Allied Telesis RE1000 Plus support by T.Hagawa
+	99/12/30	port to 2.3.35 by K.Takai
+*/
 
 #include <linux/config.h>
 #include <linux/errno.h>