summaryrefslogtreecommitdiffstats
path: root/include/pci_ids
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-01-11 05:16:06 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2014-01-18 18:51:54 +0000
commit3d3ae75c86f9ed47d86e471e4043827bb7731e92 (patch)
tree76564a4865fe8c7088368b1bc29e1b9d5d9e8111 /include/pci_ids
parent8d4357b5ba9e224ffe02e2457a2f4ffe2915f608 (diff)
downloadexternal_mesa3d-3d3ae75c86f9ed47d86e471e4043827bb7731e92.zip
external_mesa3d-3d3ae75c86f9ed47d86e471e4043827bb7731e92.tar.gz
external_mesa3d-3d3ae75c86f9ed47d86e471e4043827bb7731e92.tar.bz2
pci_ids: no not include loader.h
As per original approach by Rob, each user of the loader lib should include loader.h and the pci_id_driver_map.h header will be used exclusively by the loader. Add back the include guard __IS_LOADER and remove no longer needed include folder in the scons build. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'include/pci_ids')
-rw-r--r--include/pci_ids/pci_id_driver_map.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/pci_ids/pci_id_driver_map.h b/include/pci_ids/pci_id_driver_map.h
index 2e88451..db9e07f 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"