diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 15:40:05 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 15:40:05 +0100 |
commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /sound/pci/au88x0/au88x0_mpu401.c | |
parent | [ARM] Move AMBA include files to include/linux/amba/ (diff) | |
parent | [PATCH] Fix posix-cpu-timers sched_time accumulation (diff) | |
download | linux-123656d4cc8c946f578ebd18c2050f5251720428.tar.xz linux-123656d4cc8c946f578ebd18c2050f5251720428.zip |
Merge with Linus' kernel.
Diffstat (limited to 'sound/pci/au88x0/au88x0_mpu401.c')
-rw-r--r-- | sound/pci/au88x0/au88x0_mpu401.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c index c0c23466eb0e..8ba6dd36222b 100644 --- a/sound/pci/au88x0/au88x0_mpu401.c +++ b/sound/pci/au88x0/au88x0_mpu401.c @@ -44,9 +44,9 @@ static int __devinit snd_vortex_midi(vortex_t * vortex) { - snd_rawmidi_t *rmidi; + struct snd_rawmidi *rmidi; int temp, mode; - mpu401_t *mpu; + struct snd_mpu401 *mpu; int port; #ifdef VORTEX_MPU401_LEGACY |