diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /drivers/pps/generators/Kconfig | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/pps/generators/Kconfig')
| -rw-r--r-- | drivers/pps/generators/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pps/generators/Kconfig b/drivers/pps/generators/Kconfig index f3a73dd77660..e4c4f3dc0728 100644 --- a/drivers/pps/generators/Kconfig +++ b/drivers/pps/generators/Kconfig | |||
| @@ -6,7 +6,7 @@ comment "PPS generators support" | |||
| 6 | 6 | ||
| 7 | config PPS_GENERATOR_PARPORT | 7 | config PPS_GENERATOR_PARPORT |
| 8 | tristate "Parallel port PPS signal generator" | 8 | tristate "Parallel port PPS signal generator" |
| 9 | depends on PARPORT | 9 | depends on PARPORT && BROKEN |
| 10 | help | 10 | help |
| 11 | If you say yes here you get support for a PPS signal generator which | 11 | If you say yes here you get support for a PPS signal generator which |
| 12 | utilizes STROBE pin of a parallel port to send PPS signals. It uses | 12 | utilizes STROBE pin of a parallel port to send PPS signals. It uses |