diff options
author | Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 15:09:06 +0200 |
commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/m32r/Kconfig | |
parent | kconfig: Use PATH_MAX instead of 128 for path buffer sizes. (diff) | |
parent | kbuild: fix oldnoconfig to do the right thing (diff) | |
download | linux-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.xz 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/m32r/Kconfig')
-rw-r--r-- | arch/m32r/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 190270ea7393..3ffb886f2348 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -37,9 +37,6 @@ config HZ int default 100 -config GENERIC_TIME - def_bool y - config ARCH_USES_GETTIMEOFFSET def_bool y |