Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3206
b: refs/heads/master
c: e70c9d5
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Torokhov authored and Linus Torvalds committed Jun 25, 2005
1 parent 7812dad commit 7e3121f
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 253 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dec63ec32ea486ab915138e8790084c22a3f7bf6
refs/heads/master: e70c9d5e61c6cb2272c866fc1303e62975006752
3 changes: 3 additions & 0 deletions trunk/Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,9 @@ running once the system is up.

i810= [HW,DRM]

i8k.ignore_dmi [HW] Continue probing hardware even if DMI data
indicates that the driver is running on unsupported
hardware.
i8k.force [HW] Activate i8k driver even if SMM BIOS signature
does not match list of supported models.
i8k.power_status
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/i386/kernel/dmi_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ static void __init dmi_decode(struct dmi_header *dm)
dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
dmi_printk(("Serial Number: %s\n",
dmi_string(dm, data[7])));
dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
break;
case 2:
dmi_printk(("Board Vendor: %s\n",
Expand Down Expand Up @@ -470,7 +471,6 @@ fail: d++;

return count;
}

EXPORT_SYMBOL(dmi_check_system);

/**
Expand All @@ -480,8 +480,8 @@ EXPORT_SYMBOL(dmi_check_system);
* Returns one DMI data value, can be used to perform
* complex DMI data checks.
*/
char * dmi_get_system_info(int field)
char *dmi_get_system_info(int field)
{
return dmi_ident[field];
}

EXPORT_SYMBOL(dmi_get_system_info);
Loading

0 comments on commit 7e3121f

Please sign in to comment.