diff --git a/include/sound/minors.h b/include/sound/minors.h
index a81798a..46bcd20 100644
--- a/include/sound/minors.h
+++ b/include/sound/minors.h
@@ -21,8 +21,6 @@
  *
  */
 
-#define SNDRV_OS_MINORS			256
-
 #define SNDRV_MINOR_DEVICES		32
 #define SNDRV_MINOR_CARD(minor)		((minor) >> 5)
 #define SNDRV_MINOR_DEVICE(minor)	((minor) & 0x001f)
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index bfc096a..51d58cc 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -84,6 +84,8 @@
  *
  */
 
+#define SNDRV_PCM_DEVICES		8
+
 #define SNDRV_PCM_IOCTL1_FALSE		((void *)0)
 #define SNDRV_PCM_IOCTL1_TRUE		((void *)1)
 
@@ -414,7 +416,7 @@
 struct snd_pcm {
 	struct snd_card *card;
 	struct list_head list;
-	int device; /* device number */
+	unsigned int device;	/* device number */
 	unsigned int info_flags;
 	unsigned short dev_class;
 	unsigned short dev_subclass;