[Gc-linux-cvs] linux/sound/ppc Kconfig,1.4,1.5 Makefile,1.1,1.2

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9216/sound/ppc

Modified Files:
	Kconfig Makefile 
Log Message:
Merged 2.6.9

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Kconfig	15 Aug 2004 22:33:05 -0000	1.4
+++ Kconfig	19 Oct 2004 09:46:10 -0000	1.5
@@ -6,9 +6,12 @@
 comment "ALSA PowerMac requires I2C"
 	depends on SND && I2C=n
 
+comment "ALSA PowerMac requires INPUT"
+	depends on SND && INPUT=n
+
 config SND_POWERMAC
 	tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
-	depends on SND && I2C
+	depends on SND && I2C && INPUT
 	select SND_PCM
 
 config SND_GAMECUBE

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	4 Feb 2004 23:53:26 -0000	1.1
+++ Makefile	19 Oct 2004 09:46:10 -0000	1.2
@@ -3,7 +3,7 @@
 # Copyright (c) 2001 by Jaroslav Kysela <pe...@su...>
 #
 
-snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o
+snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
 snd-gamecube-objs := gamecube.o
 
 # Toplevel Module Dependency