Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / sound / pci / ice1712 / delta.h

diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h
index e47861ccd6e75fd94718d3454a15f152268592d6..ea7116c304c04bce4635ce308b422cf33f6674c4 100644 (file)
--- a/sound/pci/ice1712/delta.h
+++ b/sound/pci/ice1712/delta.h
@@ -7,7 +7,7 @@
  *   Lowlevel functions for M-Audio Delta 1010, 44, 66, Dio2496, Audiophile
  *                          Digigram VX442
  *
- *     Copyright (c) 2000 Jaroslav Kysela <perex@suse.cz>
+ *     Copyright (c) 2000 Jaroslav Kysela <perex@perex.cz>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -36,8 +36,10 @@
                "{Lionstracs,Mediastation},"
 
 #define ICE1712_SUBDEVICE_DELTA1010    0x121430d6
+#define ICE1712_SUBDEVICE_DELTA1010E   0xff1430d6
 #define ICE1712_SUBDEVICE_DELTADIO2496 0x121431d6
 #define ICE1712_SUBDEVICE_DELTA66      0x121432d6
+#define ICE1712_SUBDEVICE_DELTA66E     0xff1432d6
 #define ICE1712_SUBDEVICE_DELTA44      0x121433d6
 #define ICE1712_SUBDEVICE_AUDIOPHILE   0x121434d6
 #define ICE1712_SUBDEVICE_DELTA410     0x121438d6
@@ -46,7 +48,7 @@
 #define ICE1712_SUBDEVICE_MEDIASTATION 0x694c0100
 
 /* entry point */
-extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[];
+extern struct snd_ice1712_card_info snd_ice1712_delta_cards[];
 
 
 /*