diff options
author | Len Brown <len.brown@intel.com> | 2008-01-16 17:20:37 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-01-23 21:22:21 -0500 |
commit | 81b4e1f6269cea345f17d3aa349ec9beb31a8cd3 (patch) | |
tree | 1f5575297b166e51399eaf5fef680d02d30c060f | |
parent | 667984d9e481e43a930a478c588dced98cb61fea (diff) |
DMI: move dmi_available declaration to linux/dmi.h
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/firmware/dmi-id.c | 2 | ||||
-rw-r--r-- | include/linux/dmi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index bc132d8f79cb..313c99cbdc62 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c | |||
@@ -173,8 +173,6 @@ static struct device *dmi_dev; | |||
173 | if (dmi_get_system_info(_field)) \ | 173 | if (dmi_get_system_info(_field)) \ |
174 | sys_dmi_attributes[i++] = &sys_dmi_##_name##_attr.dev_attr.attr; | 174 | sys_dmi_attributes[i++] = &sys_dmi_##_name##_attr.dev_attr.attr; |
175 | 175 | ||
176 | extern int dmi_available; | ||
177 | |||
178 | /* In a separate function to keep gcc 3.2 happy - do NOT merge this in | 176 | /* In a separate function to keep gcc 3.2 happy - do NOT merge this in |
179 | dmi_id_init! */ | 177 | dmi_id_init! */ |
180 | static void __init dmi_id_init_attr_table(void) | 178 | static void __init dmi_id_init_attr_table(void) |
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 00fc7a9c35ec..b1251b2af568 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h | |||
@@ -78,6 +78,7 @@ extern const struct dmi_device * dmi_find_device(int type, const char *name, | |||
78 | extern void dmi_scan_machine(void); | 78 | extern void dmi_scan_machine(void); |
79 | extern int dmi_get_year(int field); | 79 | extern int dmi_get_year(int field); |
80 | extern int dmi_name_in_vendors(const char *str); | 80 | extern int dmi_name_in_vendors(const char *str); |
81 | extern int dmi_available; | ||
81 | 82 | ||
82 | #else | 83 | #else |
83 | 84 | ||
@@ -87,6 +88,7 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na | |||
87 | const struct dmi_device *from) { return NULL; } | 88 | const struct dmi_device *from) { return NULL; } |
88 | static inline int dmi_get_year(int year) { return 0; } | 89 | static inline int dmi_get_year(int year) { return 0; } |
89 | static inline int dmi_name_in_vendors(const char *s) { return 0; } | 90 | static inline int dmi_name_in_vendors(const char *s) { return 0; } |
91 | #define dmi_available 0 | ||
90 | 92 | ||
91 | #endif | 93 | #endif |
92 | 94 | ||