On Fri, Dec 18, 2020 at 09:57:47PM +0100, Arnd Bergmann wrote: > On Fri, Dec 18, 2020 at 7:43 PM Sam Ravnborg <s...@ravnborg.org> wrote: > > > > LEON do not have floppy support so we can drop it > > > > Signed-off-by: Sam Ravnborg <s...@ravnborg.org> > > Cc: "David S. Miller" <da...@davemloft.net> > > Cc: Sam Ravnborg <s...@ravnborg.org> > > Cc: Mike Rapoport <r...@kernel.org> > > Cc: Andrew Morton <a...@linux-foundation.org> > > Cc: Denis Efremov <efre...@linux.com> > > Cc: Willy Tarreau <w...@1wt.eu> > > Cc: Christian Brauner <christian.brau...@ubuntu.com> > > Cc: sparcli...@vger.kernel.org > > Cc: Arnd Bergmann <a...@kernel.org> > > Cc: Andreas Larsson <andr...@gaisler.com> > > --- > > arch/sparc/Kconfig | 2 +- > > arch/sparc/include/asm/floppy.h | 786 ++++++++++++++++++++++++++++- > > arch/sparc/include/asm/floppy_32.h | 393 --------------- > > arch/sparc/include/asm/floppy_64.h | 779 ---------------------------- > > Rather than renaming the floppy_64.h to floppy.h, it might be easier to just > remove the #else from floppy.h, similar to what asm/adi.h does. That is what I had first but then thought it pointless with a wrapper file. I will revert back to use floppy_64.h for now - we can always consolidate header files later.
Sam