summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2012-05-27 17:43:48 +0000
committerDavid S. Miller <davem@davemloft.net>2012-05-27 21:16:14 -0700
commit492c24e5894c65e23b11e5043c7144c2f2310abf (patch)
tree794d95ce3acd60251b8d4e0269447247bbcef591
parentc2e1ff39c106ab026e3feb29c038855b7ed00393 (diff)
downloadblackbird-obmc-linux-492c24e5894c65e23b11e5043c7144c2f2310abf.tar.gz
blackbird-obmc-linux-492c24e5894c65e23b11e5043c7144c2f2310abf.zip
sparc: fix bad merge of sparc Kconfig
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 83bd051754e1..e74ff1377626 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -41,7 +41,6 @@ config SPARC32
def_bool !64BIT
select GENERIC_ATOMIC64
select CLZ_TAB
- select ARCH_USES_GETTIMEOFFSET
config SPARC64
def_bool 64BIT
OpenPOWER on IntegriCloud