diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /sound/pci/au88x0/au88x0_mpu401.c | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'sound/pci/au88x0/au88x0_mpu401.c')
| -rw-r--r-- | sound/pci/au88x0/au88x0_mpu401.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/au88x0/au88x0_mpu401.c b/sound/pci/au88x0/au88x0_mpu401.c index e6c6a0febb75..29e5945eef60 100644 --- a/sound/pci/au88x0/au88x0_mpu401.c +++ b/sound/pci/au88x0/au88x0_mpu401.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #define MPU401_ENTER_UART 0x3f | 41 | #define MPU401_ENTER_UART 0x3f |
| 42 | #define MPU401_ACK 0xfe | 42 | #define MPU401_ACK 0xfe |
| 43 | 43 | ||
| 44 | static int __devinit snd_vortex_midi(vortex_t * vortex) | 44 | static int snd_vortex_midi(vortex_t *vortex) |
| 45 | { | 45 | { |
| 46 | struct snd_rawmidi *rmidi; | 46 | struct snd_rawmidi *rmidi; |
| 47 | int temp, mode; | 47 | int temp, mode; |