diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
| commit | c373ba999103fa794f041eab5bd490714d2dee88 (patch) | |
| tree | 8f2b445b1e0af2491c83527967dbcda76054a486 /drivers/char/Kconfig | |
| parent | 6f3529f00a0a9ac06413d18d3926adf099cb59af (diff) | |
| parent | 851b147e4411df6a1e7e90e2a609773c277eefd2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/Kconfig')
| -rw-r--r-- | drivers/char/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 6a06913b01d3..08a6f50ae791 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -1087,6 +1087,14 @@ config MMTIMER | |||
| 1087 | The mmtimer device allows direct userspace access to the | 1087 | The mmtimer device allows direct userspace access to the |
| 1088 | Altix system timer. | 1088 | Altix system timer. |
| 1089 | 1089 | ||
| 1090 | config UV_MMTIMER | ||
| 1091 | tristate "UV_MMTIMER Memory mapped RTC for SGI UV" | ||
| 1092 | depends on X86_UV | ||
| 1093 | default m | ||
| 1094 | help | ||
| 1095 | The uv_mmtimer device allows direct userspace access to the | ||
| 1096 | UV system timer. | ||
| 1097 | |||
| 1090 | source "drivers/char/tpm/Kconfig" | 1098 | source "drivers/char/tpm/Kconfig" |
| 1091 | 1099 | ||
| 1092 | config TELCLOCK | 1100 | config TELCLOCK |