summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/pci_ids/pci_id_driver_map.h5
-rw-r--r--src/loader/SConscript1
2 files changed, 4 insertions, 2 deletions
diff --git a/include/pci_ids/pci_id_driver_map.h b/include/pci_ids/pci_id_driver_map.h
index 2e88451e018..db9e07fbb28 100644
--- a/include/pci_ids/pci_id_driver_map.h
+++ b/include/pci_ids/pci_id_driver_map.h
@@ -2,12 +2,15 @@
#define _PCI_ID_DRIVER_MAP_H_
#include <stddef.h>
-#include "loader.h"
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#endif
+#ifndef __IS_LOADER
+# error "Only include from loader.c"
+#endif
+
static const int i915_chip_ids[] = {
#define CHIPSET(chip, desc, name) chip,
#include "pci_ids/i915_pci_ids.h"
diff --git a/src/loader/SConscript b/src/loader/SConscript
index 454e3284491..76b0871005b 100644
--- a/src/loader/SConscript
+++ b/src/loader/SConscript
@@ -6,7 +6,6 @@ if not env['drm']:
env = env.Clone()
env.Prepend(CPPPATH = [
- '.',
'#include'
])