diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 11:18:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-23 11:18:32 +0000 |
| commit | 554671230b9d2f79026897226546f399de4d4a50 (patch) | |
| tree | 0494e8fc94df27049cf4d54f9f4b965eba3fd0e4 /sound/soc/atmel/Makefile | |
| parent | 45c26091205eb6ad737329c5973f46fd7c122595 (diff) | |
| parent | 4ca8af579c9748376db537575f7a811c179fe50a (diff) | |
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/atmel/Makefile')
| -rw-r--r-- | sound/soc/atmel/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile index e7ea56bd5f82..a5c0bf19da78 100644 --- a/sound/soc/atmel/Makefile +++ b/sound/soc/atmel/Makefile @@ -8,9 +8,5 @@ obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o # AT91 Machine Support snd-soc-sam9g20-wm8731-objs := sam9g20_wm8731.o -# AT32 Machine Support -snd-soc-playpaq-objs := playpaq_wm8510.o - obj-$(CONFIG_SND_AT91_SOC_SAM9G20_WM8731) += snd-soc-sam9g20-wm8731.o -obj-$(CONFIG_SND_AT32_SOC_PLAYPAQ) += snd-soc-playpaq.o obj-$(CONFIG_SND_AT91_SOC_AFEB9260) += snd-soc-afeb9260.o |