diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-19 14:08:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-19 14:08:25 +0100 |
| commit | 6e78b780efdfc5cfbd3c92df7dbdfb5c81aa2a15 (patch) | |
| tree | a89246f0656e1aed6930abe35dc4682511606a72 /sound | |
| parent | c0554f102e428b8d8de3bd006a7aa77d9a3ff930 (diff) | |
| parent | 3288a66243c8d34c299dd6b8a336a34321ccff52 (diff) | |
| download | linux-3.10-6e78b780efdfc5cfbd3c92df7dbdfb5c81aa2a15.tar.gz linux-3.10-6e78b780efdfc5cfbd3c92df7dbdfb5c81aa2a15.tar.bz2 linux-3.10-6e78b780efdfc5cfbd3c92df7dbdfb5c81aa2a15.zip | |
Merge branch 'topic/virtuoso' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/Kconfig | 4 | ||||
| -rw-r--r-- | sound/pci/oxygen/virtuoso.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 6e3a1848447..82b9bddcdcd 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -744,8 +744,8 @@ config SND_VIRTUOSO select SND_OXYGEN_LIB help Say Y here to include support for sound cards based on the - Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X and - HDAV1.3 (Deluxe). + Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2 and D2X. + Support for the HDAV1.3 (Deluxe) is very experimental. To compile this driver as a module, choose M here: the module will be called snd-virtuoso. diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c index e9e829e83d7..18c7c91786b 100644 --- a/sound/pci/oxygen/virtuoso.c +++ b/sound/pci/oxygen/virtuoso.c @@ -683,7 +683,7 @@ static void xonar_hdav_uart_input(struct oxygen *chip) if (chip->uart_input_count >= 2 && chip->uart_input[chip->uart_input_count - 2] == 'O' && chip->uart_input[chip->uart_input_count - 1] == 'K') { - printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:"); + printk(KERN_DEBUG "message from Xonar HDAV HDMI chip received:\n"); print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, chip->uart_input, chip->uart_input_count); chip->uart_input_count = 0; @@ -908,6 +908,7 @@ static const struct oxygen_model model_xonar_hdav = { .dac_channels = 8, .dac_volume_min = 0x0f, .dac_volume_max = 0xff, + .misc_flags = OXYGEN_MISC_MIDI, .function_flags = OXYGEN_FUNCTION_2WIRE, .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, |