projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 028a342)
m68k: sun3: Descend to prom from arch/m68k/sun3
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 26 May 2020 12:38:08 +0000 (21:38 +0900)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 13 Jul 2020 09:39:12 +0000 (11:39 +0200)
Move prom/ to the more relevant Makefile.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20200526123810.301667-2-masahiroy@kernel.org
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/Kbuild patch | blob | history
arch/m68k/sun3/Makefile patch | blob | history

diff --git a/arch/m68k/Kbuild b/arch/m68k/Kbuild
index 7dc1398..18abb35 100644 (file)
--- a/arch/m68k/Kbuild
+++ b/arch/m68k/Kbuild
@@ -10,7 +10,7 @@ obj-$(CONFIG_MVME147)         += mvme147/
 obj-$(CONFIG_MVME16x)          += mvme16x/
 obj-$(CONFIG_BVME6000)         += bvme6000/
 obj-$(CONFIG_SUN3X)            += sun3x/ sun3/
-obj-$(CONFIG_SUN3)             += sun3/ sun3/prom/
+obj-$(CONFIG_SUN3)             += sun3/
 obj-$(CONFIG_NATFEAT)          += emu/
 obj-$(CONFIG_M68040)           += fpsp040/
 obj-$(CONFIG_M68060)           += ifpsp060/
diff --git a/arch/m68k/sun3/Makefile b/arch/m68k/sun3/Makefile
index 9960c46..4e99e17 100644 (file)
--- a/arch/m68k/sun3/Makefile
+++ b/arch/m68k/sun3/Makefile
@@ -5,4 +5,4 @@
 
 obj-y  := sun3ints.o sun3dvma.o idprom.o
 
-obj-$(CONFIG_SUN3) += config.o mmu_emu.o leds.o dvma.o intersil.o
+obj-$(CONFIG_SUN3) += config.o mmu_emu.o leds.o dvma.o intersil.o prom/
Domain: System / Kernel;