Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bbedd52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

parents f44702f4 a04ce0ff

Documentation/feature-removal-schedule.txt

+0 −9
Original line number Diff line number Diff line
@@ -25,15 +25,6 @@ Who: Pavel Machek <pavel@suse.cz> 


---------------------------



What:	PCI Name Database (CONFIG_PCI_NAMES)

When:	July 2005

Why:	It bloats the kernel unnecessarily, and is handled by userspace better

	(pciutils supports it.)  Will eliminate the need to try to keep the

	pci.ids file in sync with the sf.net database all of the time.

Who:	Greg Kroah-Hartman <gregkh@suse.de>



---------------------------



What:	io_remap_page_range() (macro or function)

When:	September 2005

Why:	Replaced by io_remap_pfn_range() which allows more memory space

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -1813,13 +1813,6 @@ M: hch@infradead.org 
L:	linux-abi-devel@lists.sourceforge.net

S:	Maintained



PCI ID DATABASE

P:	Martin Mares

M:	mj@ucw.cz

L:	pciids-devel@lists.sourceforge.net

W:	http://pciids.sourceforge.net/

S:	Maintained



PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)

P:	Thomas Sailer

M:	sailer@ife.ee.ethz.ch

arch/alpha/kernel/sys_marvel.c

+2 −3
Original line number Diff line number Diff line
@@ -373,12 +373,11 @@ marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
		irq += 0x80;			/* offset for lsi       */



#if 1

		printk("PCI:%d:%d:%d (hose %d) [%s] is using MSI\n",

		printk("PCI:%d:%d:%d (hose %d) is using MSI\n",

		       dev->bus->number, 

		       PCI_SLOT(dev->devfn), 

		       PCI_FUNC(dev->devfn),

		       hose->index,

		       pci_pretty_name (dev));

		       hose->index);

		printk("  %d message(s) from 0x%04x\n", 

		       1 << ((msg_ctl & PCI_MSI_FLAGS_QSIZE) >> 4),

		       msg_dat);

arch/i386/pci/i386.c

+3 −3
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
	/* Write-combine setting is ignored, it is changed via the mtrr

	 * interfaces on this platform.

	 */

	if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

	if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

			       vma->vm_end - vma->vm_start,

			       vma->vm_page_prot))

		return -EAGAIN;

arch/ppc/kernel/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ fixup_broken_pcnet32(struct pci_dev* dev) 
	if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {

		dev->vendor = PCI_VENDOR_ID_AMD;

		pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);

		pci_name_device(dev);

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT,	PCI_ANY_ID,			fixup_broken_pcnet32);