diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-04-18 16:24:31 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-04-18 16:24:31 +0200 |
commit | 8dd2b66d1a961231685a3bfe5937c85d846fbf5d (patch) | |
tree | 8117553488bf4ef09b048a4b343cf37cc16bf46d /Documentation/DocBook | |
parent | 126825e7ea271ae8e3172e10ca1fc22c908b5385 (diff) | |
parent | 24568ea4bef5ab8106206eddf5512434421c00ed (diff) | |
download | blackbird-obmc-linux-8dd2b66d1a961231685a3bfe5937c85d846fbf5d.tar.gz blackbird-obmc-linux-8dd2b66d1a961231685a3bfe5937c85d846fbf5d.zip |
Merge tag 'asoc-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10
The main additional change here is Lars-Peter's DMA work plus the
platform conversions which have been tested - getting this in mainline
will make life easier for development after the merge window. These
factor a large chunk of code out of the drivers for the platforms using
dmaengine, greatly simplifying development.
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index 7514dbf0a679..c36892c072da 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -227,7 +227,7 @@ X!Isound/sound_firmware.c <chapter id="uart16x50"> <title>16x50 UART Driver</title> !Edrivers/tty/serial/serial_core.c -!Edrivers/tty/serial/8250/8250.c +!Edrivers/tty/serial/8250/8250_core.c </chapter> <chapter id="fbdev"> |