diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 09:57:29 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 09:57:29 -0700 |
commit | 261d49776d3155600bbf4f441cfc7a2c3993074d (patch) | |
tree | b8f99909c4ee6a814e461788f2c50d0f8c9f0287 /pci | |
parent | 96239ed0320432f6a1f81eee2a30e0f3c6da1039 (diff) | |
download | patches-261d49776d3155600bbf4f441cfc7a2c3993074d.tar.gz |
update to 2.6.17-git10
Diffstat (limited to 'pci')
8 files changed, 16 insertions, 16 deletions
diff --git a/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch b/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch index 988c52d101a45..748f698662e15 100644 --- a/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch +++ b/pci/64bit-resource-change-pci-core-and-arch-code-to-use-resource_size_t.patch @@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> start = (start + 0x3ff) & ~0x3ff; --- gregkh-2.6.orig/arch/cris/arch-v32/drivers/pci/bios.c +++ gregkh-2.6/arch/cris/arch-v32/drivers/pci/bios.c -@@ -45,10 +45,10 @@ int pci_mmap_page_range(struct pci_dev * +@@ -43,10 +43,10 @@ int pci_mmap_page_range(struct pci_dev * void pcibios_align_resource(void *data, struct resource *res, @@ -220,7 +220,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } if (start & 0x300) { -@@ -1757,7 +1757,7 @@ long sys_pciconfig_iobase(long which, un +@@ -1756,7 +1756,7 @@ long sys_pciconfig_iobase(long which, un void pci_resource_to_user(const struct pci_dev *dev, int bar, const struct resource *rsrc, @@ -275,7 +275,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return __pgprot(prot); } -@@ -1131,7 +1131,7 @@ long sys_pciconfig_iobase(long which, un +@@ -1130,7 +1130,7 @@ long sys_pciconfig_iobase(long which, un void pci_resource_to_user(const struct pci_dev *dev, int bar, const struct resource *rsrc, @@ -350,7 +350,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> start = (start + 0x3ff) & ~0x3ff; --- gregkh-2.6.orig/arch/sparc/kernel/pcic.c +++ gregkh-2.6/arch/sparc/kernel/pcic.c -@@ -859,7 +859,7 @@ char * __init pcibios_setup(char *str) +@@ -860,7 +860,7 @@ char * __init pcibios_setup(char *str) } void pcibios_align_resource(void *data, struct resource *res, @@ -361,7 +361,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/sparc64/kernel/pci.c +++ gregkh-2.6/arch/sparc64/kernel/pci.c -@@ -360,7 +360,7 @@ void pcibios_update_irq(struct pci_dev * +@@ -357,7 +357,7 @@ void pcibios_update_irq(struct pci_dev * } void pcibios_align_resource(void *data, struct resource *res, diff --git a/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch b/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch index 74b383a1c831a..255b0f48148d8 100644 --- a/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch +++ b/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/sparc/kernel/ioport.c +++ gregkh-2.6/arch/sparc/kernel/ioport.c -@@ -206,7 +206,7 @@ _sparc_ioremap(struct resource *res, u32 +@@ -208,7 +208,7 @@ _sparc_ioremap(struct resource *res, u32 pa &= PAGE_MASK; sparc_mapiorange(bus, pa, res->start, res->end - res->start + 1); @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* -@@ -279,7 +279,7 @@ void *sbus_alloc_consistent(struct sbus_ +@@ -325,7 +325,7 @@ void *sbus_alloc_consistent(struct sbus_ res->name = sdev->prom_name; } diff --git a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch index 9676f760b4d3c..fd4081a1b85c8 100644 --- a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch +++ b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/i386/Kconfig +++ gregkh-2.6/arch/i386/Kconfig -@@ -511,6 +511,7 @@ config X86_PAE +@@ -516,6 +516,7 @@ config X86_PAE bool depends on HIGHMEM64G default y diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch index 47c36c362c8fb..5d71c6a71fd0a 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch @@ -360,7 +360,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return __pgprot(prot); --- gregkh-2.6.orig/arch/sparc/kernel/ioport.c +++ gregkh-2.6/arch/sparc/kernel/ioport.c -@@ -690,7 +690,9 @@ _sparc_io_get_info(char *buf, char **sta +@@ -819,7 +819,9 @@ _sparc_io_get_info(char *buf, char **sta if (p + 32 >= e) /* Better than nothing */ break; if ((nm = r->name) == 0) nm = "???"; diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch index c30782147b1d2..f65d752264fb0 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_set_drvdata(pdev, host); --- gregkh-2.6.orig/drivers/char/applicom.c +++ gregkh-2.6/drivers/char/applicom.c -@@ -215,13 +215,16 @@ int __init applicom_init(void) +@@ -209,13 +209,16 @@ static int __init applicom_init(void) RamIO = ioremap(dev->resource[0].start, LEN_RAM_IO); if (!RamIO) { @@ -272,7 +272,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> host->timer.data = (unsigned long)host; --- gregkh-2.6.orig/drivers/scsi/sata_via.c +++ gregkh-2.6/drivers/scsi/sata_via.c -@@ -333,10 +333,10 @@ static int svia_init_one (struct pci_dev +@@ -335,10 +335,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, diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch index efb16c057f421..a9e5897b0305e 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch @@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/net/skge.c +++ gregkh-2.6/drivers/net/skge.c -@@ -3355,8 +3355,8 @@ static int __devinit skge_probe(struct p +@@ -3354,8 +3354,8 @@ static int __devinit skge_probe(struct p if (err) goto err_out_free_irq; diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch index 4970759001fd9..9cc4abdfcffa6 100644 --- a/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch +++ b/pci/64bit-resource-fix-up-printks-for-resources-in-video-drivers.patch @@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> btv->bt848_mmio=ioremap(pci_resource_start(dev,0), 0x1000); --- gregkh-2.6.orig/drivers/media/video/cx88/cx88-alsa.c +++ gregkh-2.6/drivers/media/video/cx88/cx88-alsa.c -@@ -713,9 +713,9 @@ static int __devinit snd_cx88_create(str +@@ -712,9 +712,9 @@ static int __devinit snd_cx88_create(str pci_read_config_byte(pci, PCI_LATENCY_TIMER, &chip->pci_lat); dprintk(1,"ALSA %s/%i: found at %s, rev: %d, irq: %d, " @@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> chip->irq = pci->irq; synchronize_irq(chip->irq); -@@ -767,8 +767,8 @@ static int __devinit cx88_audio_initdev( +@@ -766,8 +766,8 @@ static int __devinit cx88_audio_initdev( strcpy (card->driver, "CX88x"); sprintf(card->shortname, "Conexant CX%x", pci->device); @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/media/video/cx88/cx88-mpeg.c +++ gregkh-2.6/drivers/media/video/cx88/cx88-mpeg.c -@@ -386,9 +386,9 @@ int cx8802_init_common(struct cx8802_dev +@@ -420,9 +420,9 @@ int cx8802_init_common(struct cx8802_dev pci_read_config_byte(dev->pci, PCI_CLASS_REVISION, &dev->pci_rev); pci_read_config_byte(dev->pci, PCI_LATENCY_TIMER, &dev->pci_lat); printk(KERN_INFO "%s/2: found at %s, rev: %d, irq: %d, " diff --git a/pci/i386-export-memory-more-than-4g-through-proc-iomem.patch b/pci/i386-export-memory-more-than-4g-through-proc-iomem.patch index ed749e2e6cb57..3bf0841cc8af4 100644 --- a/pci/i386-export-memory-more-than-4g-through-proc-iomem.patch +++ b/pci/i386-export-memory-more-than-4g-through-proc-iomem.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/i386/kernel/setup.c +++ gregkh-2.6/arch/i386/kernel/setup.c -@@ -1320,8 +1320,10 @@ legacy_init_iomem_resources(struct resou +@@ -1314,8 +1314,10 @@ legacy_init_iomem_resources(struct resou probe_roms(); for (i = 0; i < e820.nr_map; i++) { struct resource *res; |