diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/xtensa/Kconfig | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/xtensa/Kconfig')
| -rw-r--r-- | arch/xtensa/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 9e4ef660c9a5..d373d159e75e 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
| @@ -43,9 +43,6 @@ config HZ | |||
| 43 | int | 43 | int |
| 44 | default 100 | 44 | default 100 |
| 45 | 45 | ||
| 46 | config GENERIC_TIME | ||
| 47 | def_bool y | ||
| 48 | |||
| 49 | source "init/Kconfig" | 46 | source "init/Kconfig" |
| 50 | source "kernel/Kconfig.freezer" | 47 | source "kernel/Kconfig.freezer" |
| 51 | 48 | ||