diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-01 16:32:18 +0100 |
| commit | cf54d47c13c2b171f946289de445102c676d4258 (patch) | |
| tree | c7e88f33402257f3e06bc708e58843518d8ca17b /sound/soc/atmel/Makefile | |
| parent | 88d686027bb43f585914c77dd363f6e817b42c2a (diff) | |
| parent | bda63586bc5929e97288cdb371bb6456504867ed (diff) | |
| download | linux-rt-cf54d47c13c2b171f946289de445102c676d4258.tar.gz | |
Merge branch 'fix/asoc' into for-linus
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 |