summaryrefslogtreecommitdiffstats
path: root/sound/ppc/Makefile
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-06-26 16:35:44 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-06-26 16:35:44 +0100
commit62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch)
treef139adcc861a05e7cc09cdb387a271a652fc2d07 /sound/ppc/Makefile
parent17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d (diff)
parentfcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/ppc/Makefile')
-rw-r--r--sound/ppc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/Makefile b/sound/ppc/Makefile
index d6ba9959097..4d95c652c8c 100644
--- a/sound/ppc/Makefile
+++ b/sound/ppc/Makefile
@@ -3,7 +3,7 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@suse.cz>
#
-snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o toonie.o keywest.o beep.o
+snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o