Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / arch / ia64 / kernel / cpufreq / acpi-cpufreq.c

diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
index b8498ea..b0b4e6e 100644 (file)
--- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
@@ -51,7 +52,7 @@ processor_set_pstate (
        retval = ia64_pal_set_pstate((u64)value);
 
        if (retval) {
-               dprintk("Failed to set freq to 0x%x, with error 0x%x\n",
+               dprintk("Failed to set freq to 0x%x, with error 0x%lx\n",
                        value, retval);
                return -ENODEV;
        }
@@ -74,7 +75,7 @@ processor_get_pstate (
 
        if (retval)
                dprintk("Failed to get current freq with "
-                       "error 0x%x, idx 0x%x\n", retval, *value);
+                       "error 0x%lx, idx 0x%x\n", retval, *value);
 
        return (int)retval;
 }