summaryrefslogtreecommitdiff
path: root/arch/tile/Kconfig
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-11-09 23:49:23 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-11-09 23:49:23 +0400
commit5e819059a20b0fc5a71875f28b4cae359e38d85a (patch)
treeb94a18142abc5e60c84f90ee2490e8a6af01c2a9 /arch/tile/Kconfig
parentae2772b313b98a14f69b5bc67135c9fee48771be (diff)
parentcc438fccd5783c9f7b4c4858358ac897dcf8a58d (diff)
downloadlinux-5e819059a20b0fc5a71875f28b4cae359e38d85a.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/tile/Kconfig')
-rw-r--r--arch/tile/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index b30f71ac0d06..70a0de46cd1b 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -46,9 +46,6 @@ config NEED_PER_CPU_PAGE_FIRST_CHUNK
config SYS_SUPPORTS_HUGETLBFS
def_bool y
-config GENERIC_TIME
- def_bool y
-
config GENERIC_CLOCKEVENTS
def_bool y