aboutsummaryrefslogtreecommitdiffstats
path: root/pci
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-05-01 14:06:23 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-05-01 14:06:23 -0700
commit14fab1fb06371a1547f0cefee462e37507c2bf06 (patch)
tree7c9e910b6f9f06a3ccb20a658fc0fc75bdbd2954 /pci
parent7bef0df7e8db98ef5139ab6295a36940a2f806c8 (diff)
downloadpatches-14fab1fb06371a1547f0cefee462e37507c2bf06.tar.gz
refresh
Diffstat (limited to 'pci')
-rw-r--r--pci/pci-64-bit-resources-drivers-pcmcia-changes.patch2
-rw-r--r--pci/pci-msi-abstractions-and-support-for-altix.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/pci/pci-64-bit-resources-drivers-pcmcia-changes.patch b/pci/pci-64-bit-resources-drivers-pcmcia-changes.patch
index 3ad73068c6245..c9794d617f49e 100644
--- a/pci/pci-64-bit-resources-drivers-pcmcia-changes.patch
+++ b/pci/pci-64-bit-resources-drivers-pcmcia-changes.patch
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/drivers/pcmcia/i82365.c
+++ gregkh-2.6/drivers/pcmcia/i82365.c
-@@ -1083,9 +1083,10 @@ static int i365_set_mem_map(u_short sock
+@@ -1084,9 +1084,10 @@ static int i365_set_mem_map(u_short sock
u_short base, i;
u_char map;
diff --git a/pci/pci-msi-abstractions-and-support-for-altix.patch b/pci/pci-msi-abstractions-and-support-for-altix.patch
index 9ef90dd149b27..45ba637003ea3 100644
--- a/pci/pci-msi-abstractions-and-support-for-altix.patch
+++ b/pci/pci-msi-abstractions-and-support-for-altix.patch
@@ -759,7 +759,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
extern struct ia64_machine_vector ia64_mv;
-@@ -399,5 +403,8 @@ extern ia64_mv_dma_supported swiotlb_dm
+@@ -401,5 +405,8 @@ extern int ia64_pci_legacy_write(struct
#ifndef platform_migrate
# define platform_migrate machvec_noop_task
#endif