diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-01-05 08:52:11 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-01-05 08:52:11 -0800 |
| commit | 5c3eee79128c372a81a83665be2332a000944280 (patch) | |
| tree | e44331d36d63adc971003cc32540d0cb0c019525 /sound/core/timer_compat.c | |
| parent | 408045afbdb46e109a1a44e67af688e9ddf7ad66 (diff) | |
| parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) | |
Auto-update from upstream
Diffstat (limited to 'sound/core/timer_compat.c')
| -rw-r--r-- | sound/core/timer_compat.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/core/timer_compat.c b/sound/core/timer_compat.c index 3de552dfe80..5512f5373c5 100644 --- a/sound/core/timer_compat.c +++ b/sound/core/timer_compat.c @@ -22,7 +22,7 @@ #include <linux/compat.h> -struct sndrv_timer_info32 { +struct snd_timer_info32 { u32 flags; s32 card; unsigned char id[64]; @@ -33,11 +33,11 @@ struct sndrv_timer_info32 { }; static int snd_timer_user_info_compat(struct file *file, - struct sndrv_timer_info32 __user *_info) + struct snd_timer_info32 __user *_info) { - snd_timer_user_t *tu; - struct sndrv_timer_info32 info; - snd_timer_t *t; + struct snd_timer_user *tu; + struct snd_timer_info32 info; + struct snd_timer *t; tu = file->private_data; snd_assert(tu->timeri != NULL, return -ENXIO); @@ -55,7 +55,7 @@ static int snd_timer_user_info_compat(struct file *file, return 0; } -struct sndrv_timer_status32 { +struct snd_timer_status32 { struct compat_timespec tstamp; u32 resolution; u32 lost; @@ -65,10 +65,10 @@ struct sndrv_timer_status32 { }; static int snd_timer_user_status_compat(struct file *file, - struct sndrv_timer_status32 __user *_status) + struct snd_timer_status32 __user *_status) { - snd_timer_user_t *tu; - snd_timer_status_t status; + struct snd_timer_user *tu; + struct snd_timer_status status; tu = file->private_data; snd_assert(tu->timeri != NULL, return -ENXIO); @@ -89,8 +89,8 @@ static int snd_timer_user_status_compat(struct file *file, */ enum { - SNDRV_TIMER_IOCTL_INFO32 = _IOR('T', 0x11, struct sndrv_timer_info32), - SNDRV_TIMER_IOCTL_STATUS32 = _IOW('T', 0x14, struct sndrv_timer_status32), + SNDRV_TIMER_IOCTL_INFO32 = _IOR('T', 0x11, struct snd_timer_info32), + SNDRV_TIMER_IOCTL_STATUS32 = _IOW('T', 0x14, struct snd_timer_status32), }; static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg) |