[PATCH] x86_64: Clean up and tweak ACPI blacklist year code

[pandora-kernel.git] / include / linux / dmi.h

diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index c30175e..64fd6c3 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,
@@ -60,18 +61,22 @@ struct dmi_device {
        void *device_data;      /* Type specific data */
 };
 
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64)
+#ifdef CONFIG_DMI
 
 extern int dmi_check_system(struct dmi_system_id *list);
 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);
+
 #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 struct dmi_device * dmi_find_device(int type, const char *name,
+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