diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /arch/ppc | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/config.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/ppc/config.in b/arch/ppc/config.in index cdd5c4a03..7ce44ea4c 100644 --- a/arch/ppc/config.in +++ b/arch/ppc/config.in @@ -89,6 +89,7 @@ if [ "$CONFIG_NET" = "y" ]; then endmenu fi +source drivers/net/hamradio/Config.in mainmenu_option next_comment comment 'ISDN subsystem' @@ -106,6 +107,17 @@ if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then fi endmenu +# Conditionally compile in the Uniform CD-ROM driver +if [ "$CONFIG_BLK_DEV_SR" = "y" -o "$CONFIG_SBPCD" = "y" -o "$CONFIG_MCD" = "y" -o "$CONFIG_CM206" = "y" -o "$CONFIG_CDU31A" = "y" ]; then + define_bool CONFIG_CDROM y +else + if [ "$CONFIG_BLK_DEV_SR" = "m" -o "$CONFIG_SBPCD" = "m" -o "$CONFIG_MCD" = "m" -o "$CONFIG_CM206" = "m" -o "$CONFIG_CDU31A" = "m" ]; then + define_bool CONFIG_CDROM m + else + define_bool CONFIG_CDROM n + fi +fi + source fs/Config.in source fs/nls/Config.in |