~ubuntu-branches/ubuntu/karmic/linux-mvl-dove/karmic-proposed

« back to all changes in this revision

Viewing changes to sound/soc/pxa/pxa2xx-ac97.c

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Bader
  • Date: 2010-03-10 22:24:12 UTC
  • mto: (15.1.2 karmic-security)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20100310222412-k86m3r53jw0je7x1
Tags: upstream-2.6.31
ImportĀ upstreamĀ versionĀ 2.6.31

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
#include <sound/pxa2xx-lib.h>
21
21
 
22
22
#include <mach/hardware.h>
23
 
#include <mach/pxa-regs.h>
24
23
#include <mach/regs-ac97.h>
 
24
#include <mach/dma.h>
25
25
 
26
26
#include "pxa2xx-pcm.h"
27
27
#include "pxa2xx-ac97.h"
192
192
        .playback = {
193
193
                .stream_name = "AC97 Playback",
194
194
                .channels_min = 2,
195
 
                .channels_max = 6,
 
195
                .channels_max = 2,
196
196
                .rates = PXA2XX_AC97_RATES,
197
197
                .formats = SNDRV_PCM_FMTBIT_S16_LE,},
198
198
        .capture = {