diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
| commit | c2cc87ca9561ddfe744d446789cc10f507e87db9 (patch) | |
| tree | d505fc0110eb1a3d8750ba2f67648c131f0d9aca /include/linux/dmi.h | |
| parent | ce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/dmi.h')
| -rw-r--r-- | include/linux/dmi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dmi.h b/include/linux/dmi.h index a415f1d93e9a..05f4132622fc 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h | |||
| @@ -60,7 +60,7 @@ struct dmi_device { | |||
| 60 | void *device_data; /* Type specific data */ | 60 | void *device_data; /* Type specific data */ |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | #if defined(CONFIG_X86) && !defined(CONFIG_X86_64) | 63 | #if defined(CONFIG_X86_32) |
| 64 | 64 | ||
| 65 | extern int dmi_check_system(struct dmi_system_id *list); | 65 | extern int dmi_check_system(struct dmi_system_id *list); |
| 66 | extern char * dmi_get_system_info(int field); | 66 | extern char * dmi_get_system_info(int field); |