summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform/olpc/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-08 10:17:15 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-08 10:17:15 +0100
commit8a103df440afea30c91ebd42e61dc644e647f4bd (patch)
tree2cfa99e9c6e1e138e1404bce4294e46cb0034cce /arch/x86/platform/olpc/Makefile
parentsched/sysctl: Fix attributes of some extern declarations (diff)
parentdrivers/ide-cd: Handle missing driver data during status check gracefully (diff)
downloadlinux-8a103df440afea30c91ebd42e61dc644e647f4bd.tar.xz
linux-8a103df440afea30c91ebd42e61dc644e647f4bd.zip
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform/olpc/Makefile')
-rw-r--r--arch/x86/platform/olpc/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile
index fd332c533947..049f92a9379d 100644
--- a/arch/x86/platform/olpc/Makefile
+++ b/arch/x86/platform/olpc/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_OLPC) += olpc.o olpc_ofw.o olpc_dt.o
obj-$(CONFIG_OLPC_XO1_PM) += olpc-xo1-pm.o xo1-wakeup.o
obj-$(CONFIG_OLPC_XO1_RTC) += olpc-xo1-rtc.o