kernel-ark/sound
Mark Brown eae17754ab [ARM] pxa: merge AC97 platform data structures
Currently there are two possible platform datas for the PXA AC97 driver:
one supported by the generic AC97 driver only which provides callbacks
to allow board-specific configuration at stream startup and teardown,
and another for pxa2xx-ac97-lib which allows configuration of the reset
GPIO for PXA2xx CPUs.

Obviously this won't actually work when using the generic AC97 driver
since the drivers will attempt to parse the platform data in both
formats. Fix this by merging the two structures.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-04-15 10:54:06 +08:00
..
aoa Merge branch 'topic/aoa' into for-linus 2009-03-24 00:35:51 +01:00
arm [ARM] pxa: merge AC97 platform data structures 2009-04-15 10:54:06 +08:00
atmel ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4 2009-04-06 03:56:28 +02:00
core ALSA: oss - volume control for CSWITCH and CROUTE 2009-04-07 04:23:46 +02:00
drivers Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
i2c V4L/DVB (10771): tea575x-tuner: convert it to V4L2 API 2009-03-30 12:43:02 -03:00
isa ALSA: opl3sa2: add ZV port control 2009-04-06 03:46:17 +02:00
mips Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
oss trivial: Fix misspelling of firmware 2009-03-30 15:21:59 +02:00
parisc ALSA: Convert to snd_card_create() in other sound/* 2009-01-12 15:21:19 +01:00
pci Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2009-04-07 08:53:38 -07:00
pcmcia Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
ppc ALSA: move snd_powermac's probe function to .devinit.text 2009-04-06 03:52:57 +02:00
sh trivial: Fix misspelling of firmware 2009-03-30 15:21:59 +02:00
soc [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h 2009-04-15 10:53:45 +08:00
sparc sparc: Fix section mismatch warnings in cs4231 sound driver. 2009-04-08 03:28:37 -07:00
spi ALSA: Convert to snd_card_create() in other sound/* 2009-01-12 15:21:19 +01:00
synth Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
usb sound: usb-audio: allow period sizes less than 1 ms 2009-04-07 04:11:28 +02:00
ac97_bus.c ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration 2008-12-02 16:25:37 +01:00
Kconfig ALSA: Add Atmel ALSA drivers directory 2009-02-05 15:08:53 +01:00
last.c [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
Makefile ALSA: Add Atmel ALSA drivers directory 2009-02-05 15:08:53 +01:00
sound_core.c ALSA: Fix declaration of sound_class 2008-12-15 16:55:27 +01:00
sound_firmware.c Detach sched.h from mm.h 2007-05-21 09:18:19 -07:00