diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 12:03:21 -0400 |
| commit | 97148ba2235e334e57d05fa07045cf3e6629763c (patch) | |
| tree | a04504e7d4feb0dacfe1862a59abecaf99997f09 /arch/frv/Kconfig | |
| parent | 76ff3c6e3b389a5a7692811dd456e0ff58340cac (diff) | |
| parent | 05ff0e291af086f4325bac76abad250690bbbd63 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/frv/Kconfig')
| -rw-r--r-- | arch/frv/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 95a3892b8d1b..a601a17cf568 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig | |||
| @@ -29,6 +29,10 @@ config GENERIC_HARDIRQS | |||
| 29 | bool | 29 | bool |
| 30 | default n | 30 | default n |
| 31 | 31 | ||
| 32 | config GENERIC_TIME | ||
| 33 | bool | ||
| 34 | default y | ||
| 35 | |||
| 32 | config TIME_LOW_RES | 36 | config TIME_LOW_RES |
| 33 | bool | 37 | bool |
| 34 | default y | 38 | default y |