summaryrefslogtreecommitdiffstats
path: root/arch/alpha/Kconfig
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-10-12 15:09:06 +0200
committerMichal Marek <mmarek@suse.cz>2010-10-12 15:09:06 +0200
commit239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch)
tree77f79810e57d4fc24356eca0cd6db463e8994128 /arch/alpha/Kconfig
parent1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff)
parente9203c988234aa512bd45ca32b52e21c7bbfc414 (diff)
downloadblackbird-op-linux-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.gz
blackbird-op-linux-239060b93bb30a4ad55f1ecaa512464a035cc5ba.zip
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/alpha/Kconfig')
-rw-r--r--arch/alpha/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 95808c13b277..f706a88c8436 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -43,10 +43,6 @@ config GENERIC_CALIBRATE_DELAY
bool
default y
-config GENERIC_TIME
- bool
- default y
-
config GENERIC_CMOS_UPDATE
def_bool y
OpenPOWER on IntegriCloud