* [PATCH] sparc: fix bad merge of sparc Kconfig
@ 2012-05-28 3:43 Stephen Rothwell
2012-05-28 4:18 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-05-28 3:43 UTC (permalink / raw)
To: David S. Miller; +Cc: sparclinux, LKML
[-- Attachment #1: Type: text/plain, Size: 761 bytes --]
Fixes this sparc32 defconfig build error:
timekeeping.c:(.text+0x277c4): undefined reference to `arch_gettimeoffset'
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/sparc/Kconfig | 1 -
1 file changed, 1 deletion(-)
Dave, I have been carrying this merge fix in linux-next for a while and
now it is needed in Linus' tree.
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 9be0dd2..35e08fe 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -39,7 +39,6 @@ config SPARC32
def_bool !64BIT
select GENERIC_ATOMIC64
select CLZ_TAB
- select ARCH_USES_GETTIMEOFFSET
config SPARC64
def_bool 64BIT
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-28 4:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-28 3:43 [PATCH] sparc: fix bad merge of sparc Kconfig Stephen Rothwell
2012-05-28 4:18 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).