linux-next: build failure after merge of the sound-asoc tree

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/codecs/wm8903.c:376: error: redefinition of 'wm8903_dcs_event'
sound/soc/codecs/wm8903.c:279: note: previous definition of 'wm8903_dcs_event' was here
sound/soc/codecs/wm8903.c:398: error: redefinition of 'wm8903_seq_notifier'
sound/soc/codecs/wm8903.c:301: note: previous definition of 'wm8903_seq_notifier' was here

It looks like commit "ASoC: Actively manage WM8903 DC servo
configuration" has been applied twice as commits c5b6a9feaeb0 and
8e715c3194e4.

I have used the version of the sound-asoc tree from next-20110214 for
today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/