diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-12 11:55:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-12 11:55:06 -0700 |
| commit | 6939471a340468dc686845aef597be6c4a3346aa (patch) | |
| tree | c33aa90309431fae12724da0018125be9dba803a /pci | |
| parent | b66994d6a315f2dd0ca3ec8e5eb12f273ab8e336 (diff) | |
| download | patches-6939471a340468dc686845aef597be6c4a3346aa.tar.gz | |
2.6.17-rc1-git5 resync
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-64-bit-resources-drivers-media-changes.patch | 6 | ||||
| -rw-r--r-- | pci/pci-64-bit-resources-drivers-others-changes.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pci/pci-64-bit-resources-drivers-media-changes.patch b/pci/pci-64-bit-resources-drivers-media-changes.patch index 1e2ecbbd101fe..e54d61f7490a6 100644 --- a/pci/pci-64-bit-resources-drivers-media-changes.patch +++ b/pci/pci-64-bit-resources-drivers-media-changes.patch @@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!pci_dma_supported(pci_dev,0xffffffff)) { --- gregkh-2.6.orig/drivers/media/video/saa7134/saa7134-core.c +++ gregkh-2.6/drivers/media/video/saa7134/saa7134-core.c -@@ -866,9 +866,9 @@ static int __devinit saa7134_initdev(str +@@ -867,9 +867,9 @@ static int __devinit saa7134_initdev(str pci_read_config_byte(pci_dev, PCI_CLASS_REVISION, &dev->pci_rev); pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat); printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, " @@ -131,9 +131,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - dev->pci_lat,pci_resource_start(pci_dev,0)); + dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0)); pci_set_master(pci_dev); - if (!pci_dma_supported(pci_dev,0xffffffff)) { + if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) { printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name); -@@ -900,8 +900,8 @@ static int __devinit saa7134_initdev(str +@@ -901,8 +901,8 @@ static int __devinit saa7134_initdev(str pci_resource_len(pci_dev,0), dev->name)) { err = -EBUSY; diff --git a/pci/pci-64-bit-resources-drivers-others-changes.patch b/pci/pci-64-bit-resources-drivers-others-changes.patch index 13c0adcea6c1d..a91665f8010b3 100644 --- a/pci/pci-64-bit-resources-drivers-others-changes.patch +++ b/pci/pci-64-bit-resources-drivers-others-changes.patch @@ -467,7 +467,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (cannot_compare(dev->res.dma_resource[idx].flags)) --- gregkh-2.6.orig/drivers/scsi/sata_via.c +++ gregkh-2.6/drivers/scsi/sata_via.c -@@ -334,10 +334,10 @@ static int svia_init_one (struct pci_dev +@@ -333,10 +333,10 @@ static int svia_init_one (struct pci_dev if ((pci_resource_start(pdev, i) == 0) || (pci_resource_len(pdev, i) < bar_sizes[i])) { dev_printk(KERN_ERR, &pdev->dev, |