diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2024-02-04 06:21:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2024-02-04 06:21:02 -0800 |
| commit | a802f50d6e92298d44a806d326a2ba3eefa6db72 (patch) | |
| tree | 40cafff98f5248d0121656fc538e65dc9baa64b2 /arch/m68k | |
| parent | tty: serial: uartps: Add rs485 support to uartps driver (diff) | |
| parent | Linux 6.8-rc3 (diff) | |
| download | linux-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.gz linux-a802f50d6e92298d44a806d326a2ba3eefa6db72.tar.bz2 linux-a802f50d6e92298d44a806d326a2ba3eefa6db72.zip | |
Merge 6.8-rc3 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 43e39040d3ac..76ef1a67c361 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -15,10 +15,10 @@ KBUILD_DEFCONFIG := multi_defconfig ifdef cross_compiling - ifeq ($(CROSS_COMPILE),) + ifeq ($(CROSS_COMPILE),) CROSS_COMPILE := $(call cc-cross-prefix, \ m68k-linux-gnu- m68k-linux- m68k-unknown-linux-gnu-) - endif + endif endif # |