summaryrefslogtreecommitdiff
path: root/sound/drivers/vx/vx_uer.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-28 03:19:16 +0300
committerDavid S. Miller <davem@davemloft.net>2009-03-28 03:19:16 +0300
commita83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch)
tree5b5c7c3a56898485479291b7c964a1f3887d469c /sound/drivers/vx/vx_uer.c
parentf9384d41c02408dd404aa64d66d0ef38adcf6479 (diff)
parent0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff)
downloadlinux-a83398570e17af6bb81eb94f4f5dd356bd2828d8.tar.xz
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'sound/drivers/vx/vx_uer.c')
-rw-r--r--sound/drivers/vx/vx_uer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/vx/vx_uer.c b/sound/drivers/vx/vx_uer.c
index 0e1ba9b47904..b0560fec6bba 100644
--- a/sound/drivers/vx/vx_uer.c
+++ b/sound/drivers/vx/vx_uer.c
@@ -103,7 +103,7 @@ static void vx_write_one_cbit(struct vx_core *chip, int index, int val)
* returns the frequency of UER, or 0 if not sync,
* or a negative error code.
*/
-static int vx_read_uer_status(struct vx_core *chip, int *mode)
+static int vx_read_uer_status(struct vx_core *chip, unsigned int *mode)
{
int val, freq;