Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index ab4ad9562eee..b9a74a741d00 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -883,7 +883,7 @@ static ssize_t ecard_show_resources(struct device *dev, struct device_attribute
         int i;
 
         for (i = 0; i < ECARD_NUM_RESOURCES; i++)
-                str += sprintf(str, "%08lx %08lx %08lx\n",
+                str += sprintf(str, "%08x %08x %08lx\n",
                                 ec->resource[i].start,
                                 ec->resource[i].end,
                                 ec->resource[i].flags);
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 7d6a516c0b9f..ed1c4d62d999 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -344,7 +344,7 @@ static void __init setup_processor(void)
         cpu_cache = *list->cache;
 #endif
 
-        printk("CPU: %s [%08x] revision %d (ARMv%s), cr=%08x\n",
+        printk("CPU: %s [%08x] revision %d (ARMv%s), cr=%08lx\n",
                cpu_name, processor_id, (int)processor_id & 15,
                proc_arch[cpu_architecture()], cr_alignment);