From 6788a95d126c6ebdda753ecfc77764f96f123c3a Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 29 Dec 2003 05:53:33 -0800
Subject: [PATCH] [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.
---
 drivers/net/pppoe.c | 1 +
 drivers/scsi/sg.c   | 1 +
 fs/isofs/inode.c    | 3 ++-
 sound/core/sound.c  | 2 ++
 sound/sound_core.c  | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 0968a4db462af..d204dbb8d056b 100644
--- 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 a75ad800a8c62..0a768d0e9217d 100644
--- 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 28fa42c579321..bee7de9b4603f 100644
--- 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 34d5b88dbcdb9..8c55477521f12 100644
--- 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 6b675d272de59..09fb8ff48a1c7 100644
--- 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)
 {
-- 
2.53.0