diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:32:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:32:54 -0500 |
commit | 66dc918d42eaaa9afe42a47d07526765162017a9 (patch) | |
tree | 947411841773dfb076f1aa78bc5be868bc4281a6 /arch/arm/plat-s3c24xx | |
parent | b2034d474b7e1e8578bd5c2977024b51693269d9 (diff) | |
parent | 6db9a0f326d3144d790d9479309df480a8f562e4 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
ALSA: oxygen: fix Xonar DG input
ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
ALSA: hda - Fix missing EAPD for Acer 4930G
ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
ALSA: hda - Don't refer ELD when unplugged
ASoC: tpa6130a2: Fix compiler warning
ASoC: tlv320dac33: Add DAPM selection for LOM invert
ASoC: DMIC codec: Adding a generic DMIC codec
ALSA: snd-usb-us122l: Fix missing NULL checks
ALSA: snd-usb-us122l: Fix MIDI output
ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
ASoC: Fix section mismatch in wm8995.c
ALSA: oxygen: add S/PDIF source selection for Claro cards
ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
ASoC: fix migor audio build
ALSA: include delay.h for msleep in Xonar DG support
...
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index 2f91057a0c02..8a42bc48dbf0 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
@@ -259,21 +259,6 @@ struct platform_device s3c_device_iis = { | |||
259 | 259 | ||
260 | EXPORT_SYMBOL(s3c_device_iis); | 260 | EXPORT_SYMBOL(s3c_device_iis); |
261 | 261 | ||
262 | /* ASoC PCM DMA */ | ||
263 | |||
264 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; | ||
265 | |||
266 | struct platform_device s3c_device_pcm = { | ||
267 | .name = "s3c24xx-pcm-audio", | ||
268 | .id = -1, | ||
269 | .dev = { | ||
270 | .dma_mask = &s3c_device_audio_dmamask, | ||
271 | .coherent_dma_mask = 0xffffffffUL | ||
272 | } | ||
273 | }; | ||
274 | |||
275 | EXPORT_SYMBOL(s3c_device_pcm); | ||
276 | |||
277 | /* RTC */ | 262 | /* RTC */ |
278 | 263 | ||
279 | static struct resource s3c_rtc_resource[] = { | 264 | static struct resource s3c_rtc_resource[] = { |
@@ -496,8 +481,10 @@ static struct resource s3c_ac97_resource[] = { | |||
496 | }, | 481 | }, |
497 | }; | 482 | }; |
498 | 483 | ||
484 | static u64 s3c_device_audio_dmamask = 0xffffffffUL; | ||
485 | |||
499 | struct platform_device s3c_device_ac97 = { | 486 | struct platform_device s3c_device_ac97 = { |
500 | .name = "s3c-ac97", | 487 | .name = "samsung-ac97", |
501 | .id = -1, | 488 | .id = -1, |
502 | .num_resources = ARRAY_SIZE(s3c_ac97_resource), | 489 | .num_resources = ARRAY_SIZE(s3c_ac97_resource), |
503 | .resource = s3c_ac97_resource, | 490 | .resource = s3c_ac97_resource, |