diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-19 11:18:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-19 11:18:58 -0500 |
| commit | f1e9132444a97b52b20d07f352323926b2df7c32 (patch) | |
| tree | 7a2af4464d5615b4fae17b6f2eb56c698caac894 | |
| parent | ac5a28b0d3d173ba0a581342416ed339f2c3be3d (diff) | |
| parent | d4af49f810db8b855b043615c3b4312e5ba8aedb (diff) | |
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
| -rw-r--r-- | drivers/firmware/dmi_scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 88bebe1968b7..54be60ead08f 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
| @@ -560,7 +560,7 @@ static int __init dmi_present(const u8 *buf) | |||
| 560 | dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); | 560 | dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); |
| 561 | } | 561 | } |
| 562 | dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); | 562 | dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); |
| 563 | printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string); | 563 | pr_info("DMI: %s\n", dmi_ids_string); |
| 564 | return 0; | 564 | return 0; |
| 565 | } | 565 | } |
| 566 | } | 566 | } |
| @@ -588,7 +588,7 @@ static int __init dmi_smbios3_present(const u8 *buf) | |||
| 588 | dmi_ver >> 16, (dmi_ver >> 8) & 0xFF, | 588 | dmi_ver >> 16, (dmi_ver >> 8) & 0xFF, |
| 589 | dmi_ver & 0xFF); | 589 | dmi_ver & 0xFF); |
| 590 | dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); | 590 | dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); |
| 591 | pr_debug("DMI: %s\n", dmi_ids_string); | 591 | pr_info("DMI: %s\n", dmi_ids_string); |
| 592 | return 0; | 592 | return 0; |
| 593 | } | 593 | } |
| 594 | } | 594 | } |
