]> git.hungrycats.org Git - linux/commitdiff
[PATCH] PATCH: kconfig spurious shell metacharacters (1_2)
authorGreg Banks <gnb@alphalink.com.au>
Thu, 20 Jun 2002 06:51:07 +0000 (23:51 -0700)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Thu, 20 Jun 2002 06:51:07 +0000 (23:51 -0700)
The config language is *not* shell.  The construct "[ foo ] || [ bar ]"
is legal in shell but not in the config language, where we should use
the equivalent "[ foo -o bar ]"

arch/ia64/config.in

index 383a4e4954535f8c4a92c84ef6ea0e7a64f01835..882be867a289ec28af795d6717891ba45d1b2ac8 100644 (file)
@@ -64,12 +64,12 @@ if [ "$CONFIG_MCKINLEY" = "y" ]; then
        fi
 fi
 
-if [ "$CONFIG_IA64_GENERIC" = "y" ] || [ "$CONFIG_IA64_DIG" = "y" ] || [ "$CONFIG_IA64_HP_ZX1" = "y" ]; then
+if [ "$CONFIG_IA64_GENERIC" = "y" -o  "$CONFIG_IA64_DIG" = "y" -o "$CONFIG_IA64_HP_ZX1" = "y" ]; then
        bool '  Enable IA-64 Machine Check Abort' CONFIG_IA64_MCA
        define_bool CONFIG_PM y
 fi
 
-if [ "$CONFIG_IA64_SGI_SN1" = "y" ] || [ "$CONFIG_IA64_SGI_SN2" = "y" ]; then
+if [ "$CONFIG_IA64_SGI_SN1" = "y" -o  "$CONFIG_IA64_SGI_SN2" = "y" ]; then
        define_bool CONFIG_IA64_SGI_SN y
        bool '  Enable extra debugging code' CONFIG_IA64_SGI_SN_DEBUG n
        bool '  Enable SGI Medusa Simulator Support' CONFIG_IA64_SGI_SN_SIM