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/um/Kconfig.common | |
| 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/um/Kconfig.common')
| -rw-r--r-- | arch/um/Kconfig.common | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common index e90ca8609e31..049d048b070d 100644 --- a/arch/um/Kconfig.common +++ b/arch/um/Kconfig.common | |||
| @@ -53,10 +53,6 @@ config GENERIC_BUG | |||
| 53 | default y | 53 | default y |
| 54 | depends on BUG | 54 | depends on BUG |
| 55 | 55 | ||
| 56 | config GENERIC_TIME | ||
| 57 | bool | ||
| 58 | default y | ||
| 59 | |||
| 60 | config GENERIC_CLOCKEVENTS | 56 | config GENERIC_CLOCKEVENTS |
| 61 | bool | 57 | bool |
| 62 | default y | 58 | default y |