Commit 03cece06 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/lx6464es' into for-linus 

* topic/lx6464es:
  ALSA: Add missing description of lx6464es to ALSA-Configuration.txt
  ALSA: lx6464es - Disable lx_message_send()
  ALSA: lx6464es - Use snd_card_create()
  ALSA: lx6464es - driver for the digigram lx6464es interface
parents 3c2fcf36 8338c300

Documentation/sound/alsa/ALSA-Configuration.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -1112,6 +1112,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    This module supports multiple cards.

    This module supports multiple cards.

    The driver requires the firmware loader support on kernel.

    The driver requires the firmware loader support on kernel.





  Module snd-lx6464es

  -------------------



    Module for Digigram LX6464ES boards



    This module supports multiple cards.



  Module snd-maestro3

  Module snd-maestro3

  -------------------

  -------------------

include/linux/pci_ids.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -1005,6 +1005,7 @@ 
#define PCI_DEVICE_ID_PLX_PCI200SYN	0x3196

#define PCI_DEVICE_ID_PLX_PCI200SYN	0x3196

#define PCI_DEVICE_ID_PLX_9030          0x9030

#define PCI_DEVICE_ID_PLX_9030          0x9030

#define PCI_DEVICE_ID_PLX_9050		0x9050

#define PCI_DEVICE_ID_PLX_9050		0x9050

#define PCI_DEVICE_ID_PLX_9056		0x9056

#define PCI_DEVICE_ID_PLX_9080		0x9080

#define PCI_DEVICE_ID_PLX_9080		0x9080

#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2	0xa001

#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2	0xa001
@@ -1854,6 +1855,10 @@ 
#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO	0x0107

#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO	0x0107

#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2	0x0108

#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2	0x0108





#define PCI_VENDOR_ID_DIGIGRAM		0x1369

#define PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_SERIAL_SUBSYSTEM	0xc001

#define PCI_SUBDEVICE_ID_DIGIGRAM_LX6464ES_CAE_SERIAL_SUBSYSTEM	0xc002



#define PCI_VENDOR_ID_KAWASAKI		0x136b

#define PCI_VENDOR_ID_KAWASAKI		0x136b

#define PCI_DEVICE_ID_MCHIP_KL5A72002	0xff01

#define PCI_DEVICE_ID_MCHIP_KL5A72002	0xff01

sound/pci/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -635,6 +635,16 @@ config SND_KORG1212 
	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called snd-korg1212.

	  will be called snd-korg1212.





config SND_LX6464ES

	tristate "Digigram LX6464ES"

	select SND_PCM

	help

	  Say Y here to include support for Digigram LX6464ES boards.



	  To compile this driver as a module, choose M here: the module

	  will be called snd-lx6464es.





config SND_MAESTRO3

config SND_MAESTRO3

	tristate "ESS Allegro/Maestro3"

	tristate "ESS Allegro/Maestro3"

	select SND_AC97_CODEC

	select SND_AC97_CODEC

sound/pci/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ obj-$(CONFIG_SND) += \ 
	ca0106/ \

	ca0106/ \

	cs46xx/ \

	cs46xx/ \

	cs5535audio/ \

	cs5535audio/ \

	lx6464es/ \

	echoaudio/ \

	echoaudio/ \

	emu10k1/ \

	emu10k1/ \

	hda/ \

	hda/ \

sound/pci/lx6464es/Makefile

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
snd-lx6464es-objs := lx6464es.o lx_core.o

obj-$(CONFIG_SND_LX6464ES) += snd-lx6464es.o