diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /drivers/char/ipmi/ipmi_devintf.c | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'drivers/char/ipmi/ipmi_devintf.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_devintf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c index 835a33c8d5f5..1d7b429f7ffa 100644 --- a/drivers/char/ipmi/ipmi_devintf.c +++ b/drivers/char/ipmi/ipmi_devintf.c | |||
| @@ -957,3 +957,4 @@ module_exit(cleanup_ipmi); | |||
| 957 | MODULE_LICENSE("GPL"); | 957 | MODULE_LICENSE("GPL"); |
| 958 | MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>"); | 958 | MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>"); |
| 959 | MODULE_DESCRIPTION("Linux device interface for the IPMI message handler."); | 959 | MODULE_DESCRIPTION("Linux device interface for the IPMI message handler."); |
| 960 | MODULE_ALIAS("platform:ipmi_si"); | ||