summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-22 14:45:50 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-03-22 14:47:21 +0100
commit94e1b6af99b3548014686a0943bb286e3c81a889 (patch)
tree499671f055edf0041b72ca8c663b3e870745330e
parent52edf3a17714e1ba2a9060401ec0f63614bc632b (diff)
lib: rename intel_pci.c to intel_chipset.c
This is to consolidate all the chipset related functions to intel_chipset.[hc]. Unfortunately we need to rename a wrapper lib file in quick_dump, too. And quick_dump makes automake a bit unhappy apparently. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--lib/Makefile.sources2
-rw-r--r--lib/intel_chipset.c (renamed from lib/intel_pci.c)0
-rw-r--r--tools/quick_dump/Makefile.am4
-rw-r--r--tools/quick_dump/chipset_macro_wrap.c (renamed from tools/quick_dump/intel_chipset.c)0
4 files changed, 3 insertions, 3 deletions
diff --git a/lib/Makefile.sources b/lib/Makefile.sources
index a3a679c1..2b700c6c 100644
--- a/lib/Makefile.sources
+++ b/lib/Makefile.sources
@@ -18,7 +18,7 @@ libintel_tools_la_SOURCES = \
intel_drm.c \
intel_gpu_tools.h \
intel_mmio.c \
- intel_pci.c \
+ intel_chipset.c \
intel_reg.h \
ioctl_wrappers.c \
ioctl_wrappers.h \
diff --git a/lib/intel_pci.c b/lib/intel_chipset.c
index e60e0d32..e60e0d32 100644
--- a/lib/intel_pci.c
+++ b/lib/intel_chipset.c
diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am
index 1814315e..e6329c9c 100644
--- a/tools/quick_dump/Makefile.am
+++ b/tools/quick_dump/Makefile.am
@@ -7,9 +7,9 @@ bin_SCRIPTS = chipset.py
lib_LTLIBRARIES = I915ChipsetPython.la
I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) $(PCIACCESS_LIBS)
-I915ChipsetPython_la_SOURCES = chipset_wrap_python.c intel_chipset.c \
+I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c \
$(top_srcdir)/lib/intel_drm.c \
- $(top_srcdir)/lib/intel_pci.c \
+ $(top_srcdir)/lib/intel_chipset.c \
$(top_srcdir)/lib/intel_reg_map.c \
$(top_srcdir)/lib/intel_mmio.c \
$(top_srcdir)/lib/intel_iosf.c
diff --git a/tools/quick_dump/intel_chipset.c b/tools/quick_dump/chipset_macro_wrap.c
index 392b85ec..392b85ec 100644
--- a/tools/quick_dump/intel_chipset.c
+++ b/tools/quick_dump/chipset_macro_wrap.c