From 63df889513eab158fd7bcfaebc0dc16ab572a80c Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 30 Apr 2008 10:24:44 -0500 Subject: [PATCH] --- yaml --- r: 95849 b: refs/heads/master c: b17b8181c97e88e6fac5aa704879ad61fdd67351 h: refs/heads/master i: 95847: 7d92e4cc7309ccf6ff510c9257b98676fa3fa55a v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/xilinx_intc.c | 2 +- trunk/drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f68f65074403..3cc1eb412e5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 128cf7f2eb952a85875834c0d274da05ee0f02aa +refs/heads/master: b17b8181c97e88e6fac5aa704879ad61fdd67351 diff --git a/trunk/arch/powerpc/sysdev/xilinx_intc.c b/trunk/arch/powerpc/sysdev/xilinx_intc.c index ba8eea2bcce0..b7aefd0d45cb 100644 --- a/trunk/arch/powerpc/sysdev/xilinx_intc.c +++ b/trunk/arch/powerpc/sysdev/xilinx_intc.c @@ -107,7 +107,7 @@ xilinx_intc_init(struct device_node *np) } regs = ioremap(res.start, 32); - printk(KERN_INFO "Xilinx intc at 0x%08X mapped to 0x%p\n", + printk(KERN_INFO "Xilinx intc at 0x%08LX mapped to 0x%p\n", res.start, regs); /* Setup interrupt controller */ diff --git a/trunk/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/trunk/drivers/char/xilinx_hwicap/xilinx_hwicap.c index dfe6907ae15b..3edf1fc12963 100644 --- a/trunk/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/trunk/drivers/char/xilinx_hwicap/xilinx_hwicap.c @@ -623,8 +623,8 @@ static int __devinit hwicap_setup(struct device *dev, int id, if (!request_mem_region(drvdata->mem_start, drvdata->mem_size, DRIVER_NAME)) { - dev_err(dev, "Couldn't lock memory region at %p\n", - (void *)regs_res->start); + dev_err(dev, "Couldn't lock memory region at %Lx\n", + regs_res->start); retval = -EBUSY; goto failed1; } @@ -643,7 +643,7 @@ static int __devinit hwicap_setup(struct device *dev, int id, mutex_init(&drvdata->sem); drvdata->is_open = 0; - dev_info(dev, "ioremap %lx to %p with size %x\n", + dev_info(dev, "ioremap %lx to %p with size %Lx\n", (unsigned long int)drvdata->mem_start, drvdata->base_address, drvdata->mem_size);