summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-24 08:36:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-24 08:36:16 -0700
commit12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c (patch)
tree8af7cdfba131994d24ecf0bc7bc701ce11835ba2 /arch
parent143e859d05d0abf4c3b67c64c93695d59fd41342 (diff)
parent6e33a852a37dee02979ec9d82bea26c07cee5bce (diff)
downloadop-kernel-dev-12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c.zip
op-kernel-dev-12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: x86/PCI/ACPI: fix type mismatch PCI: fix new kernel-doc warning PCI: Fix warning in drivers/pci/probe.c on sparc64
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 0972315..68c3c13 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -188,7 +188,7 @@ static bool resource_contains(struct resource *res, resource_size_t point)
return false;
}
-static void coalesce_windows(struct pci_root_info *info, int type)
+static void coalesce_windows(struct pci_root_info *info, unsigned long type)
{
int i, j;
struct resource *res1, *res2;
OpenPOWER on IntegriCloud