Commit 6788a95d authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] More MODULE_ALIASes

From: Rusty Russell <rusty@rustcorp.com.au>
      Steve Youngs, Stephen Hemminger

Three more MODULE_ALIASes.  Trivial, but useful if people want things
to "just work" in 2.6.0.
parent e85132b2
...@@ -1151,3 +1151,4 @@ module_exit(pppoe_exit); ...@@ -1151,3 +1151,4 @@ module_exit(pppoe_exit);
MODULE_AUTHOR("Michal Ostrowski <mostrows@speakeasy.net>"); MODULE_AUTHOR("Michal Ostrowski <mostrows@speakeasy.net>");
MODULE_DESCRIPTION("PPP over Ethernet driver"); MODULE_DESCRIPTION("PPP over Ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_NETPROTO(PF_PPPOX);
...@@ -2976,3 +2976,4 @@ sg_proc_version_info(char *buffer, int *len, off_t * begin, ...@@ -2976,3 +2976,4 @@ sg_proc_version_info(char *buffer, int *len, off_t * begin,
module_init(init_sg); module_init(init_sg);
module_exit(exit_sg); module_exit(exit_sg);
MODULE_ALIAS_CHARDEV_MAJOR(SCSI_GENERIC_MAJOR);
...@@ -1463,4 +1463,5 @@ static void __exit exit_iso9660_fs(void) ...@@ -1463,4 +1463,5 @@ static void __exit exit_iso9660_fs(void)
module_init(init_iso9660_fs) module_init(init_iso9660_fs)
module_exit(exit_iso9660_fs) module_exit(exit_iso9660_fs)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* Actual filesystem name is iso9660, as requested in filesystems.c */
MODULE_ALIAS("iso9660");
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <sound/initval.h> #include <sound/initval.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/devfs_fs_kernel.h> #include <linux/devfs_fs_kernel.h>
#include <linux/device.h>
#define SNDRV_OS_MINORS 256 #define SNDRV_OS_MINORS 256
...@@ -52,6 +53,7 @@ MODULE_PARM_SYNTAX(major, "default:116,skill:devel"); ...@@ -52,6 +53,7 @@ MODULE_PARM_SYNTAX(major, "default:116,skill:devel");
MODULE_PARM(cards_limit, "i"); MODULE_PARM(cards_limit, "i");
MODULE_PARM_DESC(cards_limit, "Count of soundcards installed in the system."); MODULE_PARM_DESC(cards_limit, "Count of soundcards installed in the system.");
MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced"); MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced");
MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
MODULE_PARM(device_mode, "i"); MODULE_PARM(device_mode, "i");
MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs."); MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <linux/major.h> #include <linux/major.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/devfs_fs_kernel.h> #include <linux/devfs_fs_kernel.h>
#include <linux/device.h>
#define SOUND_STEP 16 #define SOUND_STEP 16
...@@ -547,6 +548,7 @@ EXPORT_SYMBOL(mod_firmware_load); ...@@ -547,6 +548,7 @@ EXPORT_SYMBOL(mod_firmware_load);
MODULE_DESCRIPTION("Core sound module"); MODULE_DESCRIPTION("Core sound module");
MODULE_AUTHOR("Alan Cox"); MODULE_AUTHOR("Alan Cox");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
static void __exit cleanup_soundcore(void) static void __exit cleanup_soundcore(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment