Merge branch 'linus' into x86/apic, to resolve conflicts

[sfrench/cifs-2.6.git] / drivers / fpga / Makefile

diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile
index e09895f0525b2f04f4720191c29e6f769eded0e9..f98dcf1d89e1afa6da1480f60b00a70e8674af1b 100644 (file)
--- a/drivers/fpga/Makefile
+++ b/drivers/fpga/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
 #
 # Makefile for the fpga framework and fpga manager drivers.
 #