5 files changed, 14 insertions, 14 deletions
diff --git a/src/gallium/drivers/pl111/Android.mk b/src/gallium/drivers/kmsro/Android.mk
index 00a123ed7a5..8a851024dc8 100644
--- a/src/gallium/drivers/pl111/Android.mk
+++ b/src/gallium/drivers/kmsro/Android.mk
@@ -28,12 +28,12 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	$(C_SOURCES)
 
-LOCAL_MODULE := libmesa_pipe_pl111
+LOCAL_MODULE := libmesa_pipe_kmsro
 
 include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 
-ifneq ($(HAVE_GALLIUM_PL111),)
+ifneq ($(HAVE_GALLIUM_KMSRO),)
 GALLIUM_TARGET_DRIVERS += pl111
-$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_pl111)
+$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_kmsro)
 endif
diff --git a/src/gallium/drivers/kmsro/Automake.inc b/src/gallium/drivers/kmsro/Automake.inc
new file mode 100644
index 00000000000..66d125cb440
--- /dev/null
+++ b/src/gallium/drivers/kmsro/Automake.inc
@@ -0,0 +1,9 @@
+if HAVE_GALLIUM_KMSRO
+
+TARGET_DRIVERS += pl111
+TARGET_CPPFLAGS += -DGALLIUM_KMSRO
+TARGET_LIB_DEPS += \
+    $(top_builddir)/src/gallium/winsys/kmsro/drm/libkmsrodrm.la \
+    $(LIBDRM_LIBS)
+
+endif
diff --git a/src/gallium/drivers/pl111/Makefile.am b/src/gallium/drivers/kmsro/Makefile.am
index b3e95eeff44..5bfaccaa1e5 100644
--- a/src/gallium/drivers/pl111/Makefile.am
+++ b/src/gallium/drivers/kmsro/Makefile.am
@@ -3,6 +3,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
 AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS)
 
-noinst_LTLIBRARIES = libpl111.la
+noinst_LTLIBRARIES = libkmsro.la
 
-libpl111_la_SOURCES = $(C_SOURCES)
+libkmsro_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/drivers/pl111/Makefile.sources b/src/gallium/drivers/kmsro/Makefile.sources
index 20396753fdb..20396753fdb 100644
--- a/src/gallium/drivers/pl111/Makefile.sources
+++ b/src/gallium/drivers/kmsro/Makefile.sources
diff --git a/src/gallium/drivers/pl111/Automake.inc b/src/gallium/drivers/pl111/Automake.inc
deleted file mode 100644
index 4ecd7dec988..00000000000
--- a/src/gallium/drivers/pl111/Automake.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-if HAVE_GALLIUM_PL111
-
-TARGET_DRIVERS += pl111
-TARGET_CPPFLAGS += -DGALLIUM_PL111
-TARGET_LIB_DEPS += \
-    $(top_builddir)/src/gallium/winsys/pl111/drm/libpl111drm.la \
-    $(LIBDRM_LIBS)
-
-endif