diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-18 13:15:58 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-18 13:15:58 -0700 |
commit | 450a5dacc2d7148c58c20306bf78e224175f4369 (patch) | |
tree | 9b18bb14c53d8aef8a8f2faad1f67c497ccaf04b /pci | |
parent | 56ddc5ed12cfed7d9186c39722e67383ad80e714 (diff) | |
download | patches-450a5dacc2d7148c58c20306bf78e224175f4369.tar.gz |
2.6.17-rc1-git14 refresh
also add more devfs removal patches
Diffstat (limited to 'pci')
-rw-r--r-- | pci/pci-64-bit-resources-arch-powerpc-changes.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pci/pci-64-bit-resources-arch-powerpc-changes.patch b/pci/pci-64-bit-resources-arch-powerpc-changes.patch index b7f34bf795f2a..d2e1726a2de0c 100644 --- a/pci/pci-64-bit-resources-arch-powerpc-changes.patch +++ b/pci/pci-64-bit-resources-arch-powerpc-changes.patch @@ -102,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hose, hose->cfg_addr, hose->cfg_data); --- gregkh-2.6.orig/arch/powerpc/platforms/chrp/pci.c +++ gregkh-2.6/arch/powerpc/platforms/chrp/pci.c -@@ -141,7 +141,7 @@ hydra_init(void) +@@ -143,7 +143,7 @@ hydra_init(void) if (np == NULL || of_address_to_resource(np, 0, &r)) return 0; Hydra = ioremap(r.start, r.end-r.start); @@ -111,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> printk("Hydra Feature_Control was %x", in_le32(&Hydra->Feature_Control)); out_le32(&Hydra->Feature_Control, (HYDRA_FC_SCC_CELL_EN | -@@ -265,7 +265,7 @@ chrp_find_bridges(void) +@@ -267,7 +267,7 @@ chrp_find_bridges(void) bus_range[0], bus_range[1]); printk(" controlled by %s", dev->type); if (!is_longtrail) |