summaryrefslogtreecommitdiff
path: root/src/mga_merge.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-05-23 23:34:07 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-05-25 14:52:47 -0700
commit3d9631b819c5c6f64ebf9bda8aab93e1cc7f391f (patch)
tree8cbe2801961d417b085a734e98f735e830b39c3c /src/mga_merge.c
parent0af7dba78559ce82b4c3eed0862415efcde51863 (diff)
Move PCI vendor/device id defines into mga.h instead of using xf86PciInfo.h
Silences deprecation warnings from xf86PciInfo.h in current Xorg servers Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mga_merge.c')
-rw-r--r--src/mga_merge.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c
index f355f76..9045b63 100644
--- a/src/mga_merge.c
+++ b/src/mga_merge.c
@@ -10,8 +10,6 @@
#include "compiler.h"
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
#include "mga.h"
#include "mga_macros.h"
#include "mga_reg.h"