[Intel-xe] [PATCH] Revert "drm/i915: define I915 during i915 driver build"

Jani Nikula jani.nikula at intel.com
Mon Oct 2 09:24:02 UTC 2023


This reverts commit 12b98dd1eb4f2ec852dce19a01a76bf43a39bbee.

We already have commit a4ba1ea69f6b ("drm/i915: define I915 during i915
driver build") in the baseline. It defines I915 at a slightly different
place from this, so there was no conflict. This can be dropped.

Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 911dfb92a8c1..dec78efa452a 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -12,7 +12,7 @@
 # Note the danger in using -Wall -Wextra is that when CI updates gcc we
 # will most likely get a sudden build breakage... Hopefully we will fix
 # new warnings before CI updates!
-subdir-ccflags-y := -Wall -Wextra -DI915
+subdir-ccflags-y := -Wall -Wextra
 subdir-ccflags-y += -Wno-format-security
 subdir-ccflags-y += -Wno-unused-parameter
 subdir-ccflags-y += -Wno-type-limits
-- 
2.39.2



More information about the Intel-xe mailing list