diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-15 09:37:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-15 09:37:00 -0700 |
| commit | 62b3c47ed27b233c54354324409e41af4839fe5d (patch) | |
| tree | 4469886504387209f227265ea914b8999118f4d2 /pci | |
| parent | 6959249171ed531e3238721562bc8204004e5cd7 (diff) | |
| download | patches-62b3c47ed27b233c54354324409e41af4839fe5d.tar.gz | |
2.6.17-rc4-git2 refresh
Diffstat (limited to 'pci')
| -rw-r--r-- | pci/pci-64-bit-resources-arch-changes.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pci/pci-64-bit-resources-arch-changes.patch b/pci/pci-64-bit-resources-arch-changes.patch index 4d11a3b5d85b7..ef989d5981257 100644 --- a/pci/pci-64-bit-resources-arch-changes.patch +++ b/pci/pci-64-bit-resources-arch-changes.patch @@ -254,16 +254,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* -@@ -274,7 +274,7 @@ void *sbus_alloc_consistent(struct sbus_ - if (mmu_map_dma_area(dma_addrp, va, res->start, len_total) != 0) - goto err_noiommu; +@@ -279,7 +279,7 @@ void *sbus_alloc_consistent(struct sbus_ + res->name = sdev->prom_name; + } - return (void *)res->start; + return (void *)(unsigned long)res->start; err_noiommu: release_resource(res); -@@ -685,7 +685,9 @@ _sparc_io_get_info(char *buf, char **sta +@@ -690,7 +690,9 @@ _sparc_io_get_info(char *buf, char **sta if (p + 32 >= e) /* Better than nothing */ break; if ((nm = r->name) == 0) nm = "???"; |