diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:11:31 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:11:31 -0500 |
| commit | 5531d28504461c4e96c6fbd80655a2bfd6481583 (patch) | |
| tree | 7074feb4e296501b5c6b8486eb5f0e5fa0a35c37 /include | |
| parent | acf63867ae06ef95eea7bf445ded2f05528a81b1 (diff) | |
| parent | a64217b922e5a06f328e3962ff903ce829aff3d6 (diff) | |
Merge branches 'release' and 'dmi' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmi.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 5b42a659a30..b1251b2af56 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -79,7 +79,6 @@ extern void dmi_scan_machine(void); extern int dmi_get_year(int field); extern int dmi_name_in_vendors(const char *str); extern int dmi_available; -extern char *dmi_get_slot(int slot); #else @@ -90,7 +89,6 @@ static inline const struct dmi_device * dmi_find_device(int type, const char *na static inline int dmi_get_year(int year) { return 0; } static inline int dmi_name_in_vendors(const char *s) { return 0; } #define dmi_available 0 -static inline char *dmi_get_slot(int slot) { return NULL; } #endif |