-- 1.5.3.7 >From ec6e9878520679b27381cad11dd07f10fb9ce426 Mon Sep 17 00:00:00 2001 From: Sedji Gaouaou sedji.gaouaou@atmel.com Date: Thu, 2 Oct 2008 19:51:31 +0200 Subject: [PATCH] Change Makefile and Kconfig to support atmel avr32 and at91 merging into a single atmel directory. Signed-off-by: Sedji Gaouaou sedji.gaouaou@atmel.com --- sound/soc/Kconfig | 3 +-- sound/soc/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 4dfda66..615ebf0 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -23,8 +23,7 @@ config SND_SOC_AC97_BUS bool # All the supported Soc's -source "sound/soc/at32/Kconfig" -source "sound/soc/at91/Kconfig" +source "sound/soc/atmel/Kconfig" source "sound/soc/au1x/Kconfig" source "sound/soc/pxa/Kconfig" source "sound/soc/s3c24xx/Kconfig" diff --git a/sound/soc/Makefile b/sound/soc/Makefile index d849349..4d475c3 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,5 +1,5 @@ snd-soc-core-objs := soc-core.o soc-dapm.o obj-$(CONFIG_SND_SOC) += snd-soc-core.o -obj-$(CONFIG_SND_SOC) += codecs/ at32/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/ +obj-$(CONFIG_SND_SOC) += codecs/ atmel/ pxa/ s3c24xx/ sh/ fsl/ davinci/ obj-$(CONFIG_SND_SOC) += omap/ au1x/ blackfin/ -- 1.5.3.7