patch-2.4.18 linux/drivers/sound/dmasound/Config.in

• Lines: 39
• Date: Wed Dec 26 16:47:48 2001
• Orig file: linux.orig/drivers/sound/dmasound/Config.in
• Orig date: Mon Feb 18 20:18:40 2002

diff -Naur -X /home/marcelo/lib/dontdiff linux.orig/drivers/sound/dmasound/Config.in linux/drivers/sound/dmasound/Config.in
@@ -4,7 +4,7 @@
    dep_tristate '  Atari DMA sound support' CONFIG_DMASOUND_ATARI $CONFIG_SOUND
 fi
 if [ "$CONFIG_ALL_PPC" = "y" ]; then
-   dep_tristate '  PowerMac DMA sound support' CONFIG_DMASOUND_AWACS $CONFIG_SOUND
+   dep_tristate '  PowerMac DMA sound support' CONFIG_DMASOUND_PMAC $CONFIG_SOUND
 fi
 if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_APUS" = "y" ]; then
    dep_tristate '  Amiga DMA sound support' CONFIG_DMASOUND_PAULA $CONFIG_SOUND
@@ -13,15 +13,27 @@
    dep_tristate '  Q40 sound support' CONFIG_DMASOUND_Q40 $CONFIG_SOUND
 fi
 if [ "$CONFIG_DMASOUND_ATARI" = "y" -o \
-     "$CONFIG_DMASOUND_AWACS" = "y" -o \
+     "$CONFIG_DMASOUND_PMAC" = "y" -o \
      "$CONFIG_DMASOUND_PAULA" = "y" -o \
      "$CONFIG_DMASOUND_Q40" = "y" ]; then
    define_tristate CONFIG_DMASOUND y
 else
    if [ "$CONFIG_DMASOUND_ATARI" = "m" -o \
-	"$CONFIG_DMASOUND_AWACS" = "m" -o \
+	"$CONFIG_DMASOUND_PMAC" = "m" -o \
 	"$CONFIG_DMASOUND_PAULA" = "m" -o \
 	"$CONFIG_DMASOUND_Q40" = "m" ]; then
       define_tristate CONFIG_DMASOUND m
    fi
 fi
+
+# the new dmasound_pmac driver needs access to the i2c bus
+if [ "$CONFIG_DMASOUND_PMAC" = "y" ] ; then
+   define_tristate CONFIG_I2C y
+   define_tristate CONFIG_I2C_KEYWEST y
+else
+   if [ "$CONFIG_DMASOUND_PMAC" = "m" ] ; then
+   define_tristate CONFIG_I2C m
+   define_tristate CONFIG_I2C_KEYWEST m
+   fi
+fi
+