diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 00:31:24 -0500 |
| commit | 05f6ece6f37f987e9de643f6f76e8fb5d5b9e014 (patch) | |
| tree | 5244e85d0dfb2619b0af4bc80a2c99dd579f79a5 /drivers/parport | |
| parent | 35d138ae22f826f95f0f8d0285947582ccf4508f (diff) | |
| parent | 58b6c58caef7a34eab7ec887288fa495696653e7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'drivers/parport')
| -rw-r--r-- | drivers/parport/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index a665951b1586..f605dea57224 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig | |||
| @@ -121,6 +121,7 @@ config PARPORT_GSC | |||
| 121 | tristate | 121 | tristate |
| 122 | default GSC | 122 | default GSC |
| 123 | depends on PARPORT | 123 | depends on PARPORT |
| 124 | select PARPORT_NOT_PC | ||
| 124 | 125 | ||
| 125 | config PARPORT_SUNBPP | 126 | config PARPORT_SUNBPP |
| 126 | tristate "Sparc hardware (EXPERIMENTAL)" | 127 | tristate "Sparc hardware (EXPERIMENTAL)" |