diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 19:51:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 19:51:55 -0400 |
| commit | b142ebb61cd36370c6fac5e0b8261a6cd7bba782 (patch) | |
| tree | c08596ccf85dbcf0f14f878f7f468756d50d983c /arch | |
| parent | 218ce7351413b8287a80fab1d7b94906a5559f01 (diff) | |
| parent | 578454ff7eab61d13a26b568f99a89a2c9edc881 (diff) | |
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.c | 1 |
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) | |||
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | MODULE_ALIAS_MISCDEV(MICROCODE_MINOR); | 262 | MODULE_ALIAS_MISCDEV(MICROCODE_MINOR); |
| 263 | MODULE_ALIAS("devname:cpu/microcode"); | ||
| 263 | #else | 264 | #else |
| 264 | #define microcode_dev_init() 0 | 265 | #define microcode_dev_init() 0 |
| 265 | #define microcode_dev_exit() do { } while (0) | 266 | #define microcode_dev_exit() do { } while (0) |