From e012ed1d11fc7e14cab767fe15bf38c08f8f7cb5 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 10 Aug 2008 23:06:25 -0400 Subject: [PATCH] --- yaml --- r: 108519 b: refs/heads/master c: cbbdece3048d0844b1cc6f4f8d18085e190721d7 h: refs/heads/master i: 108517: bc7422b3d5df36b79562009a7e9db89f00bba0b9 108515: a1063da451d009c699830402f855ef0c005e37f9 108511: e87772a8b7eeb8e940572a0ed682345c5e8449ee v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/xilinx_ps2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 85ad153a66a7..e2c984a252f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88da765f4d5f59f67a7a51c8f5d608a836b32133 +refs/heads/master: cbbdece3048d0844b1cc6f4f8d18085e190721d7 diff --git a/trunk/drivers/input/serio/xilinx_ps2.c b/trunk/drivers/input/serio/xilinx_ps2.c index 0ed044d5e685..765007899d9a 100644 --- a/trunk/drivers/input/serio/xilinx_ps2.c +++ b/trunk/drivers/input/serio/xilinx_ps2.c @@ -269,8 +269,8 @@ static int xps2_setup(struct device *dev, struct resource *regs_res, * we have the PS2 in a good state */ out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET); - dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%08X, irq=%d\n", - drvdata->phys_addr, (u32)drvdata->base_address, drvdata->irq); + dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%p, irq=%d\n", + drvdata->phys_addr, drvdata->base_address, drvdata->irq); serio = &drvdata->serio; serio->id.type = SERIO_8042;