[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.

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 0968a4db462af90d4e13935cbf9e9b3c9ec32032..d204dbb8d056bbbaae350a195b6ad49404944f15 100644 (file)
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -1151,3 +1151,4 @@ module_exit(pppoe_exit);
 MODULE_AUTHOR("Michal Ostrowski <mostrows@speakeasy.net>");
 MODULE_DESCRIPTION("PPP over Ethernet driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_PPPOX);

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index a75ad800a8c6233ee10e9f64304805f930b583a3..0a768d0e9217d8a8835947aa481a68f5c7181958 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2976,3 +2976,4 @@ sg_proc_version_info(char *buffer, int *len, off_t * begin,
 
 module_init(init_sg);
 module_exit(exit_sg);
+MODULE_ALIAS_CHARDEV_MAJOR(SCSI_GENERIC_MAJOR);

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 28fa42c5793211b31b7379773b4d4eb1b00c2d4e..bee7de9b4603f9c8e80d2244e629b393184ef7e1 100644 (file)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -1463,4 +1463,5 @@ static void __exit exit_iso9660_fs(void)
 module_init(init_iso9660_fs)
 module_exit(exit_iso9660_fs)
 MODULE_LICENSE("GPL");
-
+/* Actual filesystem name is iso9660, as requested in filesystems.c */
+MODULE_ALIAS("iso9660");

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 34d5b88dbcdb9ea83a63967affa9efbc7c198b8a..8c55477521f12d4059e8f8d729b335a91aff0ef9 100644 (file)
--- a/sound/core/sound.c
+++ b/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
 
@@ -52,6 +53,7 @@ MODULE_PARM_SYNTAX(major, "default:116,skill:devel");
 MODULE_PARM(cards_limit, "i");
 MODULE_PARM_DESC(cards_limit, "Count of soundcards installed in the system.");
 MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced");
+MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
 #ifdef CONFIG_DEVFS_FS
 MODULE_PARM(device_mode, "i");
 MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");

diff --git a/sound/sound_core.c b/sound/sound_core.c
index 6b675d272de59a62f10e9638b12b0fc899c8c778..09fb8ff48a1c7a00754da5f5514aa294f797d897 100644 (file)
--- a/sound/sound_core.c
+++ b/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,6 +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);
 
 static void __exit cleanup_soundcore(void)
 {