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

diff --combined Documentation/sound/alsa/ALSA-Configuration.txt
index c903db869dd6582de23a8b053282da65e7afc91c,dfd266eec707cfe8f605a71931f8b6804da6a034..8cf17fe43003a365e2e44d5b7771adabcde89c6b
--- 1/Documentation/sound/alsa/ALSA-Configuration.txt
--- 2/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@@ -460,25 -460,6 +460,25 @@@ Prior to version 0.9.0rc4 options had 
  
      The power-management is supported.
  
 +  Module snd-ctxfi
 +  ----------------
 +
 +    Module for Creative Sound Blaster X-Fi boards (20k1 / 20k2 chips)
 +      * Creative Sound Blaster X-Fi Titanium Fatal1ty Champion Series
 +      * Creative Sound Blaster X-Fi Titanium Fatal1ty Professional Series
 +      * Creative Sound Blaster X-Fi Titanium Professional Audio
 +      * Creative Sound Blaster X-Fi Titanium
 +      * Creative Sound Blaster X-Fi Elite Pro
 +      * Creative Sound Blaster X-Fi Platinum
 +      * Creative Sound Blaster X-Fi Fatal1ty
 +      * Creative Sound Blaster X-Fi XtremeGamer
 +      * Creative Sound Blaster X-Fi XtremeMusic
 +
 +    reference_rate    - reference sample rate, 44100 or 48000 (default)
 +    multiple          - multiple to ref. sample rate, 1 or 2 (default)
 +
 +    This module supports multiple cards.
 +
    Module snd-darla20
    ------------------
  
@@@ -1112,6 -1093,13 +1112,13 @@@
      This module supports multiple cards.
      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
    -------------------
  

diff --combined include/linux/pci_ids.h
index 36b8ff9fe259f7d62dcb91c8d1c2c0b40c2d246a,2b1a69598e748b74baef27780b686a675f1b5922..28fe766393a38de1d5bda4e50f1eb2014f09750a
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1005,6 -1005,7 +1005,7 @@@
  #define PCI_DEVICE_ID_PLX_PCI200SYN   0x3196
  #define PCI_DEVICE_ID_PLX_9030          0x9030
  #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_GTEK_SERIAL2        0xa001
  
@@@ -1314,13 -1315,6 +1315,13 @@@
  
  #define PCI_VENDOR_ID_CREATIVE                0x1102 /* duplicate: ECTIVA */
  #define PCI_DEVICE_ID_CREATIVE_EMU10K1        0x0002
 +#define PCI_DEVICE_ID_CREATIVE_20K1   0x0005
 +#define PCI_DEVICE_ID_CREATIVE_20K2   0x000b
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB0760      0x0024
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB08801     0x0041
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB08802     0x0042
 +#define PCI_SUBDEVICE_ID_CREATIVE_SB08803     0x0043
 +#define PCI_SUBDEVICE_ID_CREATIVE_HENDRIX     0x6000
  
  #define PCI_VENDOR_ID_ECTIVA          0x1102 /* duplicate: CREATIVE */
  #define PCI_DEVICE_ID_ECTIVA_EV1938   0x8938
@@@ -1413,7 -1407,7 +1414,7 @@@
  #define PCI_DEVICE_ID_VIA_82C598_1    0x8598
  #define PCI_DEVICE_ID_VIA_838X_1      0xB188
  #define PCI_DEVICE_ID_VIA_83_87XX_1   0xB198
 -#define PCI_DEVICE_ID_VIA_C409_IDE    0XC409
 +#define PCI_DEVICE_ID_VIA_VX855_IDE   0xC409
  #define PCI_DEVICE_ID_VIA_ANON                0xFFFF
  
  #define PCI_VENDOR_ID_SIEMENS           0x110A
@@@ -1854,6 -1848,10 +1855,10 @@@
  #define PCI_SUBDEVICE_ID_HYPERCOPE_METRO      0x0107
  #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_DEVICE_ID_MCHIP_KL5A72002 0xff01
  
@@@ -2521,8 -2519,6 +2526,8 @@@
  #define PCI_DEVICE_ID_INTEL_IOAT_TBG3 0x3433
  #define PCI_DEVICE_ID_INTEL_82830_HB  0x3575
  #define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577
 +#define PCI_DEVICE_ID_INTEL_82854_HB  0x358c
 +#define PCI_DEVICE_ID_INTEL_82854_IG  0x358e
  #define PCI_DEVICE_ID_INTEL_82855GM_HB        0x3580
  #define PCI_DEVICE_ID_INTEL_82855GM_IG        0x3582
  #define PCI_DEVICE_ID_INTEL_E7520_MCH 0x3590

diff --combined sound/pci/Kconfig
index feba076b36664e92b3f16adf9e2cbb946709b9df,e912b70b6f9c69e15a221ee8f826d0fc7bcf494f..b306bb457a41a3d3595de2739c5071444c5d861f
--- 1/sound/pci/Kconfig
--- 2/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@@ -275,16 -275,6 +275,16 @@@ config SND_CS5535AUDI
          To compile this driver as a module, choose M here: the module
          will be called snd-cs5535audio.
  
 +config SND_CTXFI
 +      tristate "Creative Sound Blaster X-Fi"
 +      select SND_PCM
 +      help
 +        If you want to use soundcards based on Creative Sound Blastr X-Fi
 +        boards with 20k1 or 20k2 chips, say Y here.
 +
 +        To compile this driver as a module, choose M here: the module
 +        will be called snd-ctxfi.
 +
  config SND_DARLA20
        tristate "(Echoaudio) Darla20"
        select FW_LOADER
@@@ -542,9 -532,6 +542,9 @@@ config SND_HDS
          To compile this driver as a module, choose M here: the module
          will be called snd-hdsp.
  
 +comment "Don't forget to add built-in firmwares for HDSP driver"
 +      depends on SND_HDSP=y
 +
  config SND_HDSPM
        tristate "RME Hammerfall DSP MADI"
        select SND_HWDEP
@@@ -635,6 -622,16 +635,16 @@@ config SND_KORG121
          To compile this driver as a module, choose M here: the module
          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
        tristate "ESS Allegro/Maestro3"
        select SND_AC97_CODEC

diff --combined sound/pci/Makefile
index 6a1281ec01e3958df5fdde2f7ff9e88173149f3c,7d83e084dcf474d4435a0652e18aae73d1ea05db..ecfc609d2b9f427b04330bc31f0acbd35a0126ac
--- 1/sound/pci/Makefile
--- 2/sound/pci/Makefile
+++ b/sound/pci/Makefile
@@@ -59,10 -59,10 +59,11 @@@ obj-$(CONFIG_SND) += 
        ali5451/ \
        au88x0/ \
        aw2/ \
 +      ctxfi/ \
        ca0106/ \
        cs46xx/ \
        cs5535audio/ \
+       lx6464es/ \
        echoaudio/ \
        emu10k1/ \
        hda/ \