diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-01-04 22:07:47 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-01-04 22:07:47 +1100 |
| commit | d538d94f0ca86cfedc892cc427169219acb3c2f7 (patch) | |
| tree | 8363c4ff35907edb5245da737d7f6982bf22b945 /arch/sh/boards/mach-kfr2r09/Makefile | |
| parent | f460772291f8171988b2b60141a45706123d0c69 (diff) | |
| parent | 96d4f267e40f9509e8a66e2b39e8b95655617693 (diff) | |
Merge branch 'master' into fixes
We have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'
argument from access_ok() function"), so merge master to get it.
Diffstat (limited to 'arch/sh/boards/mach-kfr2r09/Makefile')
| -rw-r--r-- | arch/sh/boards/mach-kfr2r09/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-kfr2r09/Makefile b/arch/sh/boards/mach-kfr2r09/Makefile index 60dd63f4a427..4a4a35ad7ba0 100644 --- a/arch/sh/boards/mach-kfr2r09/Makefile +++ b/arch/sh/boards/mach-kfr2r09/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 obj-y := setup.o sdram.o ifneq ($(CONFIG_FB_SH_MOBILE_LCDC),) obj-y += lcd_wqvga.o |