diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /include/linux/dmi.h | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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); |