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/parisc/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/parisc/Kconfig')
| -rw-r--r-- | arch/parisc/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index 82cec342bd30..33c02143828f 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
| @@ -59,10 +59,6 @@ config GENERIC_CALIBRATE_DELAY | |||
| 59 | bool | 59 | bool |
| 60 | default y | 60 | default y |
| 61 | 61 | ||
| 62 | config GENERIC_TIME | ||
| 63 | bool | ||
| 64 | default y | ||
| 65 | |||
| 66 | config TIME_LOW_RES | 62 | config TIME_LOW_RES |
| 67 | bool | 63 | bool |
| 68 | depends on SMP | 64 | depends on SMP |