diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-07-15 01:05:02 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-07-15 01:05:02 +0000 |
| commit | 8fb456f891a591ad793de43307a5dc3df4c87a8a (patch) | |
| tree | cc4f863b184b052d66d40a1a2b4e49228850140d /sys/dev | |
| parent | 8aa2891569bc80b89cdcc6e355be03af5c232bde (diff) | |
put smbios date access under NBIOS > 0 instead of CONFIG_DMI
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/drm_linux.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c index b6fa9799da9..641d21efd0d 100644 --- a/sys/dev/pci/drm/drm_linux.c +++ b/sys/dev/pci/drm/drm_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_linux.c,v 1.45 2019/07/15 00:52:52 jsg Exp $ */ +/* $OpenBSD: drm_linux.c,v 1.46 2019/07/15 01:05:01 jsg Exp $ */ /* * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org> * Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org> @@ -29,6 +29,10 @@ #include <linux/pagevec.h> #include <linux/dma-fence-array.h> +#if defined(__amd64__) || defined(__i386__) +#include "bios.h" +#endif + void tasklet_run(void *arg) { @@ -407,7 +411,7 @@ dmi_first_match(const struct dmi_system_id *sysid) return NULL; } -#ifdef CONFIG_DMI +#if NBIOS > 0 extern char smbios_bios_date[]; #endif @@ -415,7 +419,7 @@ const char * dmi_get_system_info(int slot) { WARN_ON(slot != DMI_BIOS_DATE); -#ifdef CONFIG_DMI +#if NBIOS > 0 if (slot == DMI_BIOS_DATE) return smbios_bios_date; #endif |