Merge branch 'topic/bkl' into topic/core-cleanup

klaby · Apr 13, 2010 · 067e4a5 · 067e4a5
2 parents 0d0fb0f + 4cf19b8
commit 067e4a5
Show file tree

Hide file tree

Showing 12 changed files with 633 additions and 205 deletions.
diff --git a/sound/atmel/Kconfig b/sound/atmel/Kconfig
@@ -12,7 +12,7 @@ config SND_ATMEL_AC97C
 	tristate "Atmel AC97 Controller (AC97C) driver"
 	select SND_PCM
 	select SND_AC97_CODEC
-	depends on DW_DMAC && AVR32
+	depends on (DW_DMAC && AVR32) || ARCH_AT91
 	help
 	  ALSA sound driver for the Atmel AC97 controller.