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/frv/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/frv/Kconfig')
| -rw-r--r-- | arch/frv/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 06256796200a..a57951f6c348 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
| @@ -36,10 +36,6 @@ config GENERIC_HARDIRQS_NO__DO_IRQ | |||
| 36 | bool | 36 | bool |
| 37 | default y | 37 | default y |
| 38 | 38 | ||
| 39 | config GENERIC_TIME | ||
| 40 | bool | ||
| 41 | default y | ||
| 42 | |||
| 43 | config TIME_LOW_RES | 39 | config TIME_LOW_RES |
| 44 | bool | 40 | bool |
| 45 | default y | 41 | default y |