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.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
dmi.h
diff --git
a/include/linux/dmi.h
b/include/linux/dmi.h
index
64fd6c3
..
0791df2
100644
(file)
--- a/
include/linux/dmi.h
+++ b/
include/linux/dmi.h
@@
-2,7
+2,6
@@
#define __DMI_H__
#include <linux/list.h>
#define __DMI_H__
#include <linux/list.h>
-#include <linux/config.h>
enum dmi_field {
DMI_NONE,
enum dmi_field {
DMI_NONE,
@@
-69,7
+68,7
@@
extern struct dmi_device * dmi_find_device(int type, const char *name,
struct dmi_device *from);
extern void dmi_scan_machine(void);
extern int dmi_get_year(int field);
struct dmi_device *from);
extern void dmi_scan_machine(void);
extern int dmi_get_year(int field);
-
+extern int dmi_cpus;
#else
static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }
#else
static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }