Skip to content

Commit 1255148

Browse files
committed
Merge tag 'sh-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from John Paul Adrian Glaubitz: "Since the large patch series to convert arch/sh to device tree support has not been finalized yet due to various maintainers still asking for changes to the series, this ended up being rather small consisting of just two fixes. The first patch by Geert Uytterhoeven addresses a build failure in the EcoVec platform code. And the second patch by Masahiro Yamada removes an unnecessary $(foreach ...) found in a Makefile of the vsyscall code. - Rename missed backlight field from fbdev to dev - Remove unnecessary $(foreach ...)" * tag 'sh-for-v6.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux: sh: vsyscall: Remove unnecessary $(foreach ...) sh: ecovec24: Rename missed backlight field from fbdev to dev
2 parents b1737ad + 99fe83a commit 1255148

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

arch/sh/boards/mach-ecovec24/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@ static int __init arch_setup(void)
12201220
lcdc_info.ch[0].num_modes = ARRAY_SIZE(ecovec_dvi_modes);
12211221

12221222
/* No backlight */
1223-
gpio_backlight_data.fbdev = NULL;
1223+
gpio_backlight_data.dev = NULL;
12241224

12251225
gpio_set_value(GPIO_PTA2, 1);
12261226
gpio_set_value(GPIO_PTU1, 1);

arch/sh/kernel/vsyscall/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-y += vsyscall.o vsyscall-syscall.o vsyscall-syms.o
33

4-
$(obj)/vsyscall-syscall.o: \
5-
$(foreach F,trapa,$(obj)/vsyscall-$F.so)
4+
$(obj)/vsyscall-syscall.o: $(obj)/vsyscall-trapa.so
65

76
# Teach kbuild about targets
8-
targets += $(foreach F,trapa,vsyscall-$F.o vsyscall-$F.so)
7+
targets += vsyscall-trapa.o vsyscall-traps.so
98
targets += vsyscall-note.o vsyscall.lds vsyscall-dummy.o
109

1110
# The DSO images are built using a special linker script

0 commit comments

Comments
 (0)