linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / dmi.h

diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index 0791df2..2e6bbe0 100644 (file)
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -2,6 +2,7 @@
 #define __DMI_H__
 
 #include <linux/list.h>
+#include <linux/config.h>
 
 enum dmi_field {
        DMI_NONE,
@@ -67,15 +68,13 @@ extern char * dmi_get_system_info(int field);
 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);
-extern int dmi_cpus;
+
 #else
 
 static inline int dmi_check_system(struct dmi_system_id *list) { return 0; }
 static inline char * dmi_get_system_info(int field) { return NULL; }
 static inline struct dmi_device * dmi_find_device(int type, const char *name,
        struct dmi_device *from) { return NULL; }
-static inline int dmi_get_year(int year) { return 0; }
 
 #endif