Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108519
b: refs/heads/master
c: cbbdece
h: refs/heads/master
i:
  108517: bc7422b
  108515: a1063da
  108511: e87772a
v: v3
  • Loading branch information
Andrew Morton authored and Dmitry Torokhov committed Aug 11, 2008
1 parent af5d927 commit e012ed1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 88da765f4d5f59f67a7a51c8f5d608a836b32133
refs/heads/master: cbbdece3048d0844b1cc6f4f8d18085e190721d7
4 changes: 2 additions & 2 deletions trunk/drivers/input/serio/xilinx_ps2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e012ed1

Please sign in to comment.