aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Christian Egtvedt <hcegtvedt@atmel.com>2009-02-05 07:11:01 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-05 09:08:53 -0500
commit6c7578bb0a631d018a68e5f90554f29fbd928055 (patch)
tree2fa40790df5387e2b6309ee4a2bcafd2b2ed801b
parent4ede028f8716523fc31e0d3d01b81405613dfb8f (diff)
ALSA: Add Atmel ALSA drivers directory
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/Kconfig2
-rw-r--r--sound/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index 200aca1faa71..1eceb85287c5 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -60,6 +60,8 @@ source "sound/aoa/Kconfig"
60 60
61source "sound/arm/Kconfig" 61source "sound/arm/Kconfig"
62 62
63source "sound/atmel/Kconfig"
64
63source "sound/spi/Kconfig" 65source "sound/spi/Kconfig"
64 66
65source "sound/mips/Kconfig" 67source "sound/mips/Kconfig"
diff --git a/sound/Makefile b/sound/Makefile
index c76d70716fa5..ec467decfa79 100644
--- a/sound/Makefile
+++ b/sound/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
6obj-$(CONFIG_SOUND_PRIME) += oss/ 6obj-$(CONFIG_SOUND_PRIME) += oss/
7obj-$(CONFIG_DMASOUND) += oss/ 7obj-$(CONFIG_DMASOUND) += oss/
8obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \ 8obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ \
9 sparc/ spi/ parisc/ pcmcia/ mips/ soc/ 9 sparc/ spi/ parisc/ pcmcia/ mips/ soc/ atmel/
10obj-$(CONFIG_SND_AOA) += aoa/ 10obj-$(CONFIG_SND_AOA) += aoa/
11 11
12# This one must be compilable even if sound is configured out 12# This one must be compilable even if sound is configured out