diff options
| author | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/msm/mdp4_overlay.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
| parent | Staging: ti-st: update TODO (diff) | |
| download | kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.gz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/msm/mdp4_overlay.c')
| -rw-r--r-- | drivers/staging/msm/mdp4_overlay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/msm/mdp4_overlay.c b/drivers/staging/msm/mdp4_overlay.c index 304bb8297635..de284c28faa1 100644 --- a/drivers/staging/msm/mdp4_overlay.c +++ b/drivers/staging/msm/mdp4_overlay.c @@ -874,8 +874,8 @@ struct mdp4_overlay_pipe *mdp4_overlay_pipe_alloc(void) if (pipe->pipe_ndx == 0) { pipe->pipe_ndx = i + 1; /* start from 1 */ init_completion(&pipe->comp); - printk(KERN_INFO "mdp4_overlay_pipe_alloc: pipe=%x ndx=%d\n", - (int)pipe, pipe->pipe_ndx); + printk(KERN_INFO "mdp4_overlay_pipe_alloc: pipe=%p ndx=%d\n", + pipe, pipe->pipe_ndx); return pipe; } pipe++; @@ -887,8 +887,8 @@ struct mdp4_overlay_pipe *mdp4_overlay_pipe_alloc(void) void mdp4_overlay_pipe_free(struct mdp4_overlay_pipe *pipe) { - printk(KERN_INFO "mdp4_overlay_pipe_free: pipe=%x ndx=%d\n", - (int)pipe, pipe->pipe_ndx); + printk(KERN_INFO "mdp4_overlay_pipe_free: pipe=%p ndx=%d\n", + pipe, pipe->pipe_ndx); memset(pipe, 0, sizeof(*pipe)); } |