diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-17 11:15:36 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-17 21:26:34 +0000 |
| commit | a8fe50ab6503d9cb63931771318dc3e84d002092 (patch) | |
| tree | 68b704d8590de6330a26d13cdcafad71e788438d /src/intel_module.c | |
| parent | 3320b459d6fe90d1145e3874c840b95279fb16c8 (diff) | |
uxa: Explicitly check for libdrm_intel in configure
And remove the excess dependencies from the common files.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_module.c')
| -rw-r--r-- | src/intel_module.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/intel_module.c b/src/intel_module.c index f452e1b7..fb98a040 100644 --- a/src/intel_module.c +++ b/src/intel_module.c @@ -31,15 +31,13 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86cmap.h" +#include "xf86drmMode.h" #include "common.h" -#include "intel.h" #include "intel_driver.h" #include "legacy/legacy.h" #include "sna/sna_module.h" -#include <xf86drmMode.h> - static struct intel_device_info *chipset_info; static const struct intel_device_info intel_i81x_info = { @@ -140,6 +138,8 @@ static const SymTabRec _intel_chipsets[] = { {PCI_CHIP_IVYBRIDGE_S_GT1, "Ivybridge Server" }, {-1, NULL} }; +#define NUM_CHIPSETS (sizeof(_intel_chipsets) / sizeof(_intel_chipsets[0])) + SymTabRec *intel_chipsets = (SymTabRec *) _intel_chipsets; #define INTEL_DEVICE_MATCH(d,i) \ @@ -298,7 +298,7 @@ static Bool intel_pci_probe(DriverPtr driver, intptr_t match_data) { ScrnInfoPtr scrn; - PciChipsets intel_pci_chipsets[ARRAY_SIZE(_intel_chipsets)]; + PciChipsets intel_pci_chipsets[NUM_CHIPSETS]; unsigned i; chipset_info = (void *)match_data; @@ -319,7 +319,7 @@ static Bool intel_pci_probe(DriverPtr driver, #endif } - for (i = 0; i < ARRAY_SIZE(_intel_chipsets); i++) { + for (i = 0; i < NUM_CHIPSETS; i++) { intel_pci_chipsets[i].numChipset = intel_chipsets[i].token; intel_pci_chipsets[i].PCIid = intel_chipsets[i].token; intel_pci_chipsets[i].dummy = NULL; |