Re: [PATCH] powerpc: Fix 85xx build

2022-10-11 Thread Linus Torvalds
On Mon, Oct 10, 2022 at 8:59 PM Joel Stanley  wrote:
>
> The merge of the kbuild tree dropped the renaming of the FSL_BOOKE
> kconfig option.

Thanks. Mea culpa. Applied,

Linus


[PATCH] powerpc: Fix 85xx build

2022-10-10 Thread Joel Stanley
The merge of the kbuild tree dropped the renaming of the FSL_BOOKE
kconfig option.

Fixes: 8afc66e8d43b ("Merge tag 'kbuild-v6.1' of 
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild")
Signed-off-by: Joel Stanley 
---
 arch/powerpc/kernel/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 68ea30fb373e..ee2d76cb3187 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -121,7 +121,7 @@ obj-$(CONFIG_PPC_BOOK3S_32) += head_book3s_32.o
 obj-$(CONFIG_40x)  += head_40x.o
 obj-$(CONFIG_44x)  += head_44x.o
 obj-$(CONFIG_PPC_8xx)  += head_8xx.o
-obj-$(CONFIG_FSL_BOOKE)+= head_85xx.o
+obj-$(CONFIG_PPC_85xx) += head_85xx.o
 extra-y+= vmlinux.lds
 
 obj-$(CONFIG_RELOCATABLE)  += reloc_$(BITS).o
-- 
2.35.1