ALSA CVS update - Takashi Iwai <tiwai@suse.de>

OSS device core,ALSA Core
- take MODULE_ALIAS_CHARDEV_MAJOR() back.
- added missing inclusion of linux/device.h.

sound/core/sound.c

@@ -31,6 +31,7 @@
 #include <sound/initval.h>
 #include <linux/kmod.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
 
 #define SNDRV_OS_MINORS 256
 
@@ -57,8 +58,7 @@ MODULE_PARM(device_mode, "i");
 MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");
 MODULE_PARM_SYNTAX(device_mode, "default:0666,base:8");
 #endif
-// MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
-MODULE_ALIAS("char-major-" __stringify(CONFIG_SND_MAJOR));
+MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
 
 /* this one holds the actual max. card number currently available.
  * as default, it's identical with cards_limit option.  when more

sound/sound_core.c

@@ -45,6 +45,7 @@
 #include <linux/major.h>
 #include <linux/kmod.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
 
 #define SOUND_STEP 16
 
@@ -547,8 +548,7 @@ EXPORT_SYMBOL(mod_firmware_load);
 MODULE_DESCRIPTION("Core sound module");
 MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
-// MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
-MODULE_ALIAS("char-major-" __stringify(SOUND_MAJOR));
+MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
 
 static void __exit cleanup_soundcore(void)
 {