diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
| commit | 1c5c0c934f91fbce2825acbb849e98781e774c1d (patch) | |
| tree | 12b5ae03516d4103bc070e4579ae1f7f71c27d24 /arch/alpha | |
| parent | 4fe70c31de87823ac9e804f4795589ba74dc6971 (diff) | |
Merge with 2.1.47. Some more cleanup and module fixes.
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/config.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/alpha/config.in b/arch/alpha/config.in index 774686ebd..6ac472f08 100644 --- a/arch/alpha/config.in +++ b/arch/alpha/config.in @@ -99,7 +99,10 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Kernel support for JAVA binaries' CONFIG_BINFMT_JAVA fi tristate 'Kernel support for Linux/Intel ELF binaries' CONFIG_BINFMT_EM86 -tristate 'Parallel port support' CONFIG_PNP_PARPORT +tristate 'Parallel port support' CONFIG_PARPORT +if [ "$CONFIG_PARPORT" != "n" ]; then + dep_tristate ' PC-style hardware' CONFIG_PARPORT_PC $CONFIG_PARPORT +fi endmenu source drivers/pnp/Config.in |