diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-26 08:22:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-26 08:22:50 +0100 |
| commit | 7fbb8759eff9a348efa5f352ffaa51c364837c4b (patch) | |
| tree | d40cd3f47b9f667ba94d9613270132080dcb6a1a /drivers/acpi/numa.c | |
| parent | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into core/debug
Diffstat (limited to 'drivers/acpi/numa.c')
| -rw-r--r-- | drivers/acpi/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index cb9864e39ba..25ceae9191e 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -258,7 +258,7 @@ int __init acpi_numa_init(void) int acpi_get_pxm(acpi_handle h) { - unsigned long pxm; + unsigned long long pxm; acpi_status status; acpi_handle handle; acpi_handle phandle = h; |