Patchwork sparc: fix bad merge of sparc Kconfig

login
register
mail settings
Submitter Stephen Rothwell
Date May 28, 2012, 3:43 a.m.
Message ID <20120528134348.c934fef7360aa10683fc3a28@canb.auug.org.au>
Download mbox | patch
Permalink /patch/161574/
State Accepted
Delegated to: David Miller
Headers show

Comments

Stephen Rothwell - May 28, 2012, 3:43 a.m.
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.
David Miller - May 28, 2012, 4:18 a.m.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 May 2012 13:43:48 +1000

> 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.

I'll merge this in, thanks Stephen.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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