diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-03 11:03:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-03 11:03:00 -0700 |
| commit | 603eefda5fcf8f9dab3ae253e677abb285f6f3bc (patch) | |
| tree | 70e7f7e6338c3117b58f30a2a19b81bb6a5216de /arch/openrisc/lib/Makefile | |
| parent | 50ddcdb2635c82e195a2557341d759c5b9419bf1 (diff) | |
| parent | 1955d843efc3b5cf3ab4878986a87ad4972ff4e1 (diff) | |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC updates from Stafford Horne:
"A few cleanups and compiler warning fixes for OpenRISC.
Also, this includes dts and defconfig updates to enable Ethernet on
OpenRISC/Litex FPGA SoC's now that the LiteEth driver has gone
upstream"
* tag 'for-linus' of git://github.com/openrisc/linux:
openrisc/litex: Update defconfig
openrisc/litex: Add ethernet device
openrisc/litex: Update uart address
openrisc: Fix compiler warnings in setup
openrisc: rename or32 code & comments to or1k
openrisc: don't printk() unconditionally
Diffstat (limited to 'arch/openrisc/lib/Makefile')
| -rw-r--r-- | arch/openrisc/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/lib/Makefile b/arch/openrisc/lib/Makefile index 79775aaa6baa..53327406b483 100644 --- a/arch/openrisc/lib/Makefile +++ b/arch/openrisc/lib/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Makefile for or32 specific library files.. +# Makefile for or1k specific library files.. # obj-y := delay.o string.o memset.o memcpy.o |