diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
tree | 89354903b01fa0a447bffeefe00df3044495db2e /drivers/char/Config.in | |
parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'drivers/char/Config.in')
-rw-r--r-- | drivers/char/Config.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Config.in b/drivers/char/Config.in index 45b0b2447..c6d225616 100644 --- a/drivers/char/Config.in +++ b/drivers/char/Config.in @@ -164,6 +164,7 @@ if [ "$CONFIG_VIDEO_DEV" != "n" ]; then if [ "$CONFIG_RADIO_ZOLTRIX" = "y" ]; then hex ' ZOLTRIX I/O port (0x20c or 0x30c)' CONFIG_RADIO_ZOLTRIX_PORT 20c fi + dep_tristate 'IIC on parallel port' CONFIG_I2C_PARPORT $CONFIG_PARPORT fi endmenu |