diff options
| author | Márton Németh <nm127@freemail.hu> | 2011-05-14 13:27:33 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-06-01 14:51:05 -0400 |
| commit | 6e33a852a37dee02979ec9d82bea26c07cee5bce (patch) | |
| tree | c896c5dd0e00b6414c8cd06c65e96c1fe43b1091 /arch/x86 | |
| parent | 3f37d6229ca309f96b163b943ff982f4697630cd (diff) | |
x86/PCI/ACPI: fix type mismatch
The flags field of struct resource from linux/ioport.h is "unsigned
long". Change the "type" parameter of coalesce_windows() function to
match that field. This fixes the following warning messages when
compiling with "make C=1 W=1 bzImage modules":
arch/x86/pci/acpi.c: In function ‘coalesce_windows’:
arch/x86/pci/acpi.c:198: warning: conversion to ‘long unsigned int’ from ‘int’ may change the sign of the result
arch/x86/pci/acpi.c:203: warning: conversion to ‘long unsigned int’ from ‘int’ may change the sign of the result
Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
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; |