diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-15 20:27:12 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-15 20:27:12 +0400 |
commit | cd2d95d97c8d1b66467507400c63d707ddb1deba (patch) | |
tree | 7ad5223ba88110ca6735637c9eef327515e9bb96 /Documentation/DocBook/device-drivers.tmpl | |
parent | 88dd75af0e49e1dabef6f7c7f7f4fa0234b9b988 (diff) | |
parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
download | linux-cd2d95d97c8d1b66467507400c63d707ddb1deba.tar.xz |
Merge tag 'v3.9-rc7' into regulator-fix-core
Linux 3.9-rc7
Trivial context overlap conflicts:
MAINTAINERS
Diffstat (limited to 'Documentation/DocBook/device-drivers.tmpl')
-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"> |