Commit 12551488 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b1737ad4 99fe83ab

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

+1 −1
Original line number Diff line number Diff line
@@ -1220,7 +1220,7 @@ static int __init arch_setup(void) 
		lcdc_info.ch[0].num_modes		= ARRAY_SIZE(ecovec_dvi_modes);



		/* No backlight */

		gpio_backlight_data.fbdev = NULL;

		gpio_backlight_data.dev = NULL;



		gpio_set_value(GPIO_PTA2, 1);

		gpio_set_value(GPIO_PTU1, 1);

arch/sh/kernel/vsyscall/Makefile

+2 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y += vsyscall.o vsyscall-syscall.o vsyscall-syms.o



$(obj)/vsyscall-syscall.o: \

	$(foreach F,trapa,$(obj)/vsyscall-$F.so)

$(obj)/vsyscall-syscall.o: $(obj)/vsyscall-trapa.so



# Teach kbuild about targets

targets += $(foreach F,trapa,vsyscall-$F.o vsyscall-$F.so)

targets += vsyscall-trapa.o vsyscall-traps.so

targets += vsyscall-note.o vsyscall.lds vsyscall-dummy.o



# The DSO images are built using a special linker script