diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-24 11:36:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-24 11:36:16 -0400 |
| commit | 12f1ba5a7dac4caf8b4e6ccd6453f0a095e74c7c (patch) | |
| tree | 8af7cdfba131994d24ecf0bc7bc701ce11835ba2 /arch/x86 | |
| parent | 143e859d05d0abf4c3b67c64c93695d59fd41342 (diff) | |
| parent | 6e33a852a37dee02979ec9d82bea26c07cee5bce (diff) | |
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/x86')
| -rw-r--r-- | arch/x86/pci/acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 0972315c3860..68c3c1395202 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) | |||
| 188 | return false; | 188 | return false; |
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | static void coalesce_windows(struct pci_root_info *info, int type) | 191 | static void coalesce_windows(struct pci_root_info *info, unsigned long type) |
| 192 | { | 192 | { |
| 193 | int i, j; | 193 | int i, j; |
| 194 | struct resource *res1, *res2; | 194 | struct resource *res1, *res2; |