From 44a6a621e148b14209bbeec044f0063f4a89c5df Mon Sep 17 00:00:00 2001
From: Omair Mohammed Abdullah <omair.m.abdullah@intel.com>
Date: Fri, 23 Dec 2011 10:36:36 +0530
Subject: [PATCH] --- yaml --- r: 284126 b: refs/heads/master c:
 3eafc959b32f71d3fe6b27c9eae7495a23acfc3a h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/sound/core.h   | 1 +
 trunk/include/sound/minors.h | 4 +++-
 trunk/sound/core/sound.c     | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 85960e5bdb86..59db79a3eb05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57bd9b8ddd434111918d3f7cb0b4297cd77f1b5b
+refs/heads/master: 3eafc959b32f71d3fe6b27c9eae7495a23acfc3a
diff --git a/trunk/include/sound/core.h b/trunk/include/sound/core.h
index 3be5ab782b99..5ab255f196cc 100644
--- a/trunk/include/sound/core.h
+++ b/trunk/include/sound/core.h
@@ -62,6 +62,7 @@ typedef int __bitwise snd_device_type_t;
 #define	SNDRV_DEV_BUS		((__force snd_device_type_t) 0x1007)
 #define	SNDRV_DEV_CODEC		((__force snd_device_type_t) 0x1008)
 #define	SNDRV_DEV_JACK          ((__force snd_device_type_t) 0x1009)
+#define	SNDRV_DEV_COMPRESS	((__force snd_device_type_t) 0x100A)
 #define	SNDRV_DEV_LOWLEVEL	((__force snd_device_type_t) 0x2000)
 
 typedef int __bitwise snd_device_state_t;
diff --git a/trunk/include/sound/minors.h b/trunk/include/sound/minors.h
index 8f764204a856..5978f9a8c8b2 100644
--- a/trunk/include/sound/minors.h
+++ b/trunk/include/sound/minors.h
@@ -35,7 +35,7 @@
 #define SNDRV_MINOR_TIMER		33	/* SNDRV_MINOR_GLOBAL + 1 * 32 */
 
 #ifndef CONFIG_SND_DYNAMIC_MINORS
-						/* 2 - 3 (reserved) */
+#define SNDRV_MINOR_COMPRESS		2	/* 2 - 3 */
 #define SNDRV_MINOR_HWDEP		4	/* 4 - 7 */
 #define SNDRV_MINOR_RAWMIDI		8	/* 8 - 15 */
 #define SNDRV_MINOR_PCM_PLAYBACK	16	/* 16 - 23 */
@@ -49,6 +49,7 @@
 #define SNDRV_DEVICE_TYPE_PCM_CAPTURE	SNDRV_MINOR_PCM_CAPTURE
 #define SNDRV_DEVICE_TYPE_SEQUENCER	SNDRV_MINOR_SEQUENCER
 #define SNDRV_DEVICE_TYPE_TIMER		SNDRV_MINOR_TIMER
+#define SNDRV_DEVICE_TYPE_COMPRESS	SNDRV_MINOR_COMPRESS
 
 #else /* CONFIG_SND_DYNAMIC_MINORS */
 
@@ -60,6 +61,7 @@ enum {
 	SNDRV_DEVICE_TYPE_RAWMIDI,
 	SNDRV_DEVICE_TYPE_PCM_PLAYBACK,
 	SNDRV_DEVICE_TYPE_PCM_CAPTURE,
+	SNDRV_DEVICE_TYPE_COMPRESS,
 };
 
 #endif /* CONFIG_SND_DYNAMIC_MINORS */
diff --git a/trunk/sound/core/sound.c b/trunk/sound/core/sound.c
index 828af353ea9f..28f35593a750 100644
--- a/trunk/sound/core/sound.c
+++ b/trunk/sound/core/sound.c
@@ -229,6 +229,7 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev)
 	case SNDRV_DEVICE_TYPE_RAWMIDI:
 	case SNDRV_DEVICE_TYPE_PCM_PLAYBACK:
 	case SNDRV_DEVICE_TYPE_PCM_CAPTURE:
+	case SNDRV_DEVICE_TYPE_COMPRESS:
 		if (snd_BUG_ON(!card))
 			return -EINVAL;
 		minor = SNDRV_MINOR(card->number, type + dev);