linux/drivers/parisc, branch v3.3

[PARISC] include in drivers/parisc/iommu-helpers.h

2012-02-27T15:44:15Z

drivers/parisc/iommu-helpers.h:62: error: implicit declaration of function 'prefetchw' make[3]: *** [drivers/parisc/sba_iommu.o] Error 1 drivers/parisc/iommu-helpers.h needs to #include where prefetchw is declared. Signed-off-by: WANG Cong Signed-off-by: James Bottomley

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

2012-01-12T02:50:26Z

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits) x86/PCI: Expand the x86_msi_ops to have a restore MSIs. PCI: Increase resource array mask bit size in pcim_iomap_regions() PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT) PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB x86/PCI: amd: factor out MMCONFIG discovery PCI: Enable ATS at the device state restore PCI: msi: fix imbalanced refcount of msi irq sysfs objects PCI: kconfig: English typo in pci/pcie/Kconfig PCI/PM/Runtime: make PCI traces quieter PCI: remove pci_create_bus() xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources sparc/PCI: convert to pci_create_root_bus() sh/PCI: convert to pci_scan_root_bus() for correct root bus resources powerpc/PCI: convert to pci_create_root_bus() powerpc/PCI: split PHB part out of pcibios_map_io_space() ... Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due to the same patches being applied in other branches.

parisc/PCI: lba: convert to pci_create_root_bus() for correct root bus resources

2012-01-06T20:11:07Z

Supply root bus resources to pci_create_root_bus() so they're correct immediately. This fixes the problem of "early" and "header" quirks seeing incorrect root bus resources. CC: linux-parisc@vger.kernel.org Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes

parisc/PCI: lba: use pci_create_bus() instead of pci_scan_bus_parented()

2012-01-06T20:11:06Z

No functional change here; just converting from pci_scan_bus_parented() to pci_create_bus() to make a future patch simpler. CC: linux-parisc@vger.kernel.org Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes

parisc/PCI: lba: deal with LMMIO/PAT overlaps before creating PCI root bus

2012-01-06T20:11:05Z

This moves the truncate_pat_collision() call out of the pcibios_fixup_bus() path so that when a future patch builds a list of root bus resources for pci_create_bus(), it can use the truncated LMMIO range. truncate_pat_collision() used to be called in this path: pci_scan_bus_parented pci_create_bus pci_scan_child_bus pcibios_fixup_bus lba_fixup_bus truncate_pat_collision All of the PAT and lba_dev resource setup must be done before we call pci_scan_bus_parented(), so it should be safe to move the truncate_pat_collision() to just before pci_scan_bus_parented(). CC: linux-parisc@vger.kernel.org Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes

parisc/PCI: dino: convert to pci_create_root_bus() for correct root bus resources

2012-01-06T20:11:04Z

parisc/PCI: dino: use pci_create_bus() instead of pci_scan_bus_parented()

2012-01-06T20:11:04Z

Merge branch 'master' into for-next

2011-11-13T19:55:53Z

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver in the config and Makefile") as I have patch depending on that one.

parisc: add module.h to files really requiring it

2011-10-31T23:31:01Z

We want to clean up the implicit everywhere presence of module.h which means files like this that use module infrastructure need to explicitly call it out for inclusion. Signed-off-by: Paul Gortmaker

parisc: Add export.h to files needing EXPORT_SYMBOL/THIS_MODULE

2011-10-31T23:31:00Z

These guys were getting it implicitly via module.h before, when module.h was everywhere. Signed-off-by: Paul Gortmaker