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/mn10300/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/mn10300/Kconfig')
| -rw-r--r-- | arch/mn10300/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 7bd617c94dfe..ba8bd665ba4b 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
| @@ -39,9 +39,6 @@ config GENERIC_FIND_NEXT_BIT | |||
| 39 | config GENERIC_HWEIGHT | 39 | config GENERIC_HWEIGHT |
| 40 | def_bool y | 40 | def_bool y |
| 41 | 41 | ||
| 42 | config GENERIC_TIME | ||
| 43 | def_bool y | ||
| 44 | |||
| 45 | config GENERIC_BUG | 42 | config GENERIC_BUG |
| 46 | def_bool y | 43 | def_bool y |
| 47 | 44 | ||