diff options
| author | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-13 13:57:45 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2012-01-13 13:57:45 +0200 |
| commit | a0afd4f7c1ff8cb7a9747150500f8ce081fbcfc9 (patch) | |
| tree | 12d6c61b17e3b3b9874b9a0d1063e711af483b02 /sound/soc/atmel/Makefile | |
| parent | e80ec84d9352419a7c0482edfbf1b96eaa4c8b95 (diff) | |
| parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (diff) | |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/usb.c
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 e7ea56bd5f8..a5c0bf19da7 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 |