Commit bf0f0f39 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] fix config.in syntax errors.

 - appletalk adds unnessesary additional arguments to bool
 - net/wan has two comment statements on one line, separated by a + (!),
   also fixup indentation here.
 - sound uses a bool where it should use a dep_bool
parent 1832e934
......@@ -9,13 +9,13 @@ if [ "$CONFIG_DEV_APPLETALK" = "y" ]; then
tristate ' Apple/Farallon LocalTalk PC support' CONFIG_LTPC
tristate ' COPS LocalTalk PC support' CONFIG_COPS
if [ "$CONFIG_COPS" != "n" ]; then
bool ' Dayna firmware support' CONFIG_COPS_DAYNA $CONFIG_COPS
bool ' Tangent firmware support' CONFIG_COPS_TANGENT $CONFIG_COPS
bool ' Dayna firmware support' CONFIG_COPS_DAYNA
bool ' Tangent firmware support' CONFIG_COPS_TANGENT
fi
dep_tristate ' Appletalk-IP driver support' CONFIG_IPDDP $CONFIG_ATALK
if [ "$CONFIG_IPDDP" != "n" ]; then
bool ' IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP $CONFIG_IPDDP
bool ' Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP $CONFIG_IPDDP
bool ' IP to Appletalk-IP Encapsulation support' CONFIG_IPDDP_ENCAP
bool ' Appletalk-IP to IP Decapsulation support' CONFIG_IPDDP_DECAP
fi
fi
endmenu
......@@ -69,14 +69,15 @@ if [ "$CONFIG_WAN" = "y" ]; then
dep_tristate ' Cyclades-PC300 support (RS-232/V.35, X.21, T1/E1 boards)' CONFIG_PC300 $CONFIG_HDLC $CONFIG_PCI
if [ "$CONFIG_PC300" != "n" ]; then
if [ "$CONFIG_PPP" != "n" -a "$CONFIG_PPP_MULTLINK" != "n" -a "$CONFIG_PPP_SYNCTTY" != "n" -a "$CONFIG_HDLC_PPP" = "y" ]; then
if [ "$CONFIG_PPP" != "n" -a "$CONFIG_PPP_MULTLINK" != "n" -a \
"$CONFIG_PPP_SYNCTTY" != "n" -a "$CONFIG_HDLC_PPP" = "y" ]; then
bool ' Cyclades-PC300 MLPPP support' CONFIG_PC300_MLPPP
else
comment ' Cyclades-PC300 MLPPP support is disabled.'+ comment ' Refer to the file README.mlppp, provided by PC300 package.'
comment 'Cyclades-PC300 MLPPP support is disabled.'
comment 'Refer to the file README.mlppp, provided by PC300 package.'
fi
fi
dep_tristate ' SDL RISCom/N2 support' CONFIG_N2 $CONFIG_HDLC
dep_tristate ' Moxa C101 support' CONFIG_C101 $CONFIG_HDLC
dep_tristate ' FarSync T-Series support' CONFIG_FARSYNC $CONFIG_HDLC
......
......@@ -13,7 +13,7 @@ dep_tristate ' Sequencer support' CONFIG_SND_SEQUENCER $CONFIG_SND
if [ "$CONFIG_SND_SEQUENCER" != "n" ]; then
dep_tristate ' Sequencer dummy client' CONFIG_SND_SEQ_DUMMY $CONFIG_SND_SEQUENCER
fi
bool ' OSS API emulation' CONFIG_SND_OSSEMUL $CONFIG_SND
dep_bool ' OSS API emulation' CONFIG_SND_OSSEMUL $CONFIG_SND
if [ "$CONFIG_SND_OSSEMUL" = "y" ]; then
dep_tristate ' OSS Mixer API' CONFIG_SND_MIXER_OSS $CONFIG_SND
dep_tristate ' OSS PCM API' CONFIG_SND_PCM_OSS $CONFIG_SND
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment