aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/dmi_scan.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-06-25 17:54:25 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 19:24:24 -0400
commite70c9d5e61c6cb2272c866fc1303e62975006752 (patch)
treefcac373d1cab6df2a6ad87c2575fb16d778282af /arch/i386/kernel/dmi_scan.c
parentdec63ec32ea486ab915138e8790084c22a3f7bf6 (diff)
[PATCH] I8K: use standard DMI interface
I8K: Change to use stock dmi infrastructure instead of homegrown parsing code. The driver now requires box's DMI data to match list of supported models so driver can be safely compiled-in by default without fear of it poking into random SMM BIOS code. DMI checks can be ignored with i8k.ignore_dmi option. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/dmi_scan.c')
-rw-r--r--arch/i386/kernel/dmi_scan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index 6ed7e28f306c..3facd20212bb 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -414,6 +414,7 @@ static void __init dmi_decode(struct dmi_header *dm)
414 dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6); 414 dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
415 dmi_printk(("Serial Number: %s\n", 415 dmi_printk(("Serial Number: %s\n",
416 dmi_string(dm, data[7]))); 416 dmi_string(dm, data[7])));
417 dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
417 break; 418 break;
418 case 2: 419 case 2:
419 dmi_printk(("Board Vendor: %s\n", 420 dmi_printk(("Board Vendor: %s\n",
@@ -470,7 +471,6 @@ fail: d++;
470 471
471 return count; 472 return count;
472} 473}
473
474EXPORT_SYMBOL(dmi_check_system); 474EXPORT_SYMBOL(dmi_check_system);
475 475
476/** 476/**
@@ -480,8 +480,8 @@ EXPORT_SYMBOL(dmi_check_system);
480 * Returns one DMI data value, can be used to perform 480 * Returns one DMI data value, can be used to perform
481 * complex DMI data checks. 481 * complex DMI data checks.
482 */ 482 */
483char * dmi_get_system_info(int field) 483char *dmi_get_system_info(int field)
484{ 484{
485 return dmi_ident[field]; 485 return dmi_ident[field];
486} 486}
487 487EXPORT_SYMBOL(dmi_get_system_info);