aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 16:51:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 16:51:55 -0700
commitb142ebb61cd36370c6fac5e0b8261a6cd7bba782 (patch)
treec08596ccf85dbcf0f14f878f7f468756d50d983c /arch
parentRevert "module: drop the lock while waiting for module to complete initialization." (diff)
parentdriver core: add devname module aliases to allow module on-demand auto-loading (diff)
downloadlinux-dev-b142ebb61cd36370c6fac5e0b8261a6cd7bba782.tar.xz
linux-dev-b142ebb61cd36370c6fac5e0b8261a6cd7bba782.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: driver core: add devname module aliases to allow module on-demand auto-loading
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/microcode_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 2cd8c544e41a..fa6551d36c10 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -260,6 +260,7 @@ static void microcode_dev_exit(void)
}
MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
+MODULE_ALIAS("devname:cpu/microcode");
#else
#define microcode_dev_init() 0
#define microcode_dev_exit() do { } while (0)