Commit f1e91324 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Pull dmi fix from Jean Delvare.

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  firmware: dmi_scan: Always show system identification string
parents ac5a28b0 d4af49f8
...@@ -560,7 +560,7 @@ static int __init dmi_present(const u8 *buf) ...@@ -560,7 +560,7 @@ static int __init dmi_present(const u8 *buf)
dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); dmi_ver >> 16, (dmi_ver >> 8) & 0xFF);
} }
dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string); pr_info("DMI: %s\n", dmi_ids_string);
return 0; return 0;
} }
} }
...@@ -588,7 +588,7 @@ static int __init dmi_smbios3_present(const u8 *buf) ...@@ -588,7 +588,7 @@ static int __init dmi_smbios3_present(const u8 *buf)
dmi_ver >> 16, (dmi_ver >> 8) & 0xFF, dmi_ver >> 16, (dmi_ver >> 8) & 0xFF,
dmi_ver & 0xFF); dmi_ver & 0xFF);
dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
pr_debug("DMI: %s\n", dmi_ids_string); pr_info("DMI: %s\n", dmi_ids_string);
return 0; return 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment