git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
drivers
/
firmware
/
dmi_scan.c
diff --git
a/drivers/firmware/dmi_scan.c
b/drivers/firmware/dmi_scan.c
index
852157d
..
b9e3886
100644
(file)
--- a/
drivers/firmware/dmi_scan.c
+++ b/
drivers/firmware/dmi_scan.c
@@
-154,8
+154,6
@@
static void __init dmi_save_ipmi_device(struct dmi_header *dm)
list_add(&dev->list, &dmi_devices);
}
list_add(&dev->list, &dmi_devices);
}
-int dmi_cpus;
-
/*
* Process a DMI table entry. Right now all we care about are the BIOS
* and machine entries. For 2.5 we should pull the smbus controller info
/*
* Process a DMI table entry. Right now all we care about are the BIOS
* and machine entries. For 2.5 we should pull the smbus controller info
@@
-180,9
+178,6
@@
static void __init dmi_decode(struct dmi_header *dm)
dmi_save_ident(dm, DMI_BOARD_NAME, 5);
dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
break;
dmi_save_ident(dm, DMI_BOARD_NAME, 5);
dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
break;
- case 4: /* Central Processor */
- dmi_cpus++;
- break;
case 10: /* Onboard Devices Information */
dmi_save_devices(dm);
break;
case 10: /* Onboard Devices Information */
dmi_save_devices(dm);
break;