diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 12:38:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 12:38:52 -0400 |
| commit | 25a025863e024f6b86b48137b10b4960c50351b0 (patch) | |
| tree | 72d2521585f61d904769d28cf1d7687b949a61a6 /include | |
| parent | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (diff) | |
| parent | 7e48bf653c37eb32c2ba4c13f15aa154aa807e61 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc - wm9712 - checkpatch fixes
[ALSA] pcsp - Fix more dependency
[ALSA] hda - Add support of Medion RIM 2150
[ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
[ALSA] ice1724 - Enable watermarks
[ALSA] Add MPU401_INFO_NO_ACK bitflag
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/mpu401.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h index 68b634b75068..1f1d53f8830b 100644 --- a/include/sound/mpu401.h +++ b/include/sound/mpu401.h | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #define MPU401_INFO_INTEGRATED (1 << 2) /* integrated h/w port */ | 50 | #define MPU401_INFO_INTEGRATED (1 << 2) /* integrated h/w port */ |
| 51 | #define MPU401_INFO_MMIO (1 << 3) /* MMIO access */ | 51 | #define MPU401_INFO_MMIO (1 << 3) /* MMIO access */ |
| 52 | #define MPU401_INFO_TX_IRQ (1 << 4) /* independent TX irq */ | 52 | #define MPU401_INFO_TX_IRQ (1 << 4) /* independent TX irq */ |
| 53 | #define MPU401_INFO_NO_ACK (1 << 6) /* No ACK cmd needed */ | ||
| 53 | 54 | ||
| 54 | #define MPU401_MODE_BIT_INPUT 0 | 55 | #define MPU401_MODE_BIT_INPUT 0 |
| 55 | #define MPU401_MODE_BIT_OUTPUT 1 | 56 | #define MPU401_MODE_BIT_OUTPUT 1 |