Update of /cvsroot/linuxdc/linux-sh-dc/drivers/sound
In directory usw-pr-cvs1:/tmp/cvs-serv20342/drivers/sound
Modified Files:
Tag: linux-sh-dc-2_4-branch
Config.in
Log Message:
Fix merge breakage
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxdc/linux-sh-dc/drivers/sound/Config.in,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -d -r1.2.4.2 -r1.2.4.3
--- Config.in 26 Oct 2002 14:14:01 -0000 1.2.4.2
+++ Config.in 26 Oct 2002 14:18:28 -0000 1.2.4.3
@@ -216,7 +216,7 @@
bool ' Audio Excel DSP 16 (MPU401 emulation)' CONFIG_AEDSP16_MPU401
fi
fi
-
+
if [ "$CONFIG_ARM" = "y" ]; then
if [ "$CONFIG_ARCH_ACORN" = "y" -o "$CONFIG_ARCH_CLPS7500" = "y" ]; then
dep_tristate ' VIDC 16-bit sound' CONFIG_SOUND_VIDC $CONFIG_SOUND_OSS
|
