[Gc-linux-cvs] linux/sound/ppc Kconfig,1.7,1.8 Makefile,1.3,1.4

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

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

Modified Files:
	Kconfig Makefile 
Log Message:
Merge 2.6.12


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Kconfig	4 Jan 2005 21:39:35 -0000	1.7
+++ Kconfig	23 Jun 2005 20:02:22 -0000	1.8
@@ -11,7 +11,7 @@
 
 config SND_POWERMAC
 	tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
-	depends on SND && I2C && INPUT
+	depends on SND && I2C && INPUT && PPC_PMAC
 	select SND_PCM
 	help
 	  Say Y here to include support for the integrated sound device.

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	20 Oct 2004 00:15:42 -0000	1.3
+++ Makefile	23 Jun 2005 20:02:22 -0000	1.4
@@ -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 beep.o
+snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o toonie.o keywest.o beep.o
 snd-gcn-objs := gcn-ai.o
 
 # Toplevel Module Dependency