Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/Kconfig between commit d890d7399525 ("m68k/irq: Remove obsolete
m68k irq framework") from the m68k tree and commit 4e8a9e70dfe8 ("m68k:
selection of GENERIC_ATOMIC64 is not MMU specific") from the m68knommu
tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/m68k/Kconfig
index 361d540,26ed01b..0000000
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -3,9 -3,8 +3,8 @@@ config M68
default y
select HAVE_IDE
select HAVE_AOUT if MMU
- select GENERIC_ATOMIC64 if MMU
- select HAVE_GENERIC_HARDIRQS if !MMU
- select GENERIC_IRQ_SHOW if !MMU
+ select HAVE_GENERIC_HARDIRQS
+ select GENERIC_IRQ_SHOW
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
config RWSEM_GENERIC_SPINLOCK
Attachment:
pgposmmxI6Rgl.pgp
Description: PGP signature
