diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 01:47:12 -0500 |
| commit | 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch) | |
| tree | 7f8d84353852401ec74e005f6f0b1eb958b9a70d /drivers/parport/Kconfig | |
| parent | c0d3c0c0ce94d3db893577ae98e64414d92e49d8 (diff) | |
| parent | c03296a868ae7c91aa2d8b372184763b18f16d7a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/parport/Kconfig')
| -rw-r--r-- | drivers/parport/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index f605dea57224..f63c387976cf 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig | |||
| @@ -90,6 +90,15 @@ config PARPORT_ARC | |||
| 90 | depends on ARM && PARPORT | 90 | depends on ARM && PARPORT |
| 91 | select PARPORT_NOT_PC | 91 | select PARPORT_NOT_PC |
| 92 | 92 | ||
| 93 | config PARPORT_IP32 | ||
| 94 | tristate "SGI IP32 builtin port (EXPERIMENTAL)" | ||
| 95 | depends on SGI_IP32 && PARPORT && EXPERIMENTAL | ||
| 96 | select PARPORT_NOT_PC | ||
| 97 | help | ||
| 98 | Say Y here if you need support for the parallel port on | ||
| 99 | SGI O2 machines. This code is also available as a module (say M), | ||
| 100 | called parport_ip32. If in doubt, saying N is the safe plan. | ||
| 101 | |||
| 93 | config PARPORT_AMIGA | 102 | config PARPORT_AMIGA |
| 94 | tristate "Amiga builtin port" | 103 | tristate "Amiga builtin port" |
| 95 | depends on AMIGA && PARPORT | 104 | depends on AMIGA && PARPORT |