diff --git a/[refs] b/[refs] index 76c3606288a4..a596c77d788a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f8206c04857965cc2ff6c395633c4fdd977dd77 +refs/heads/master: e776ec19a47a325ee1d9ece2d983526dcd626c53 diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile index 1462ed86d40a..a3a83d38f96f 100644 --- a/trunk/Documentation/DocBook/Makefile +++ b/trunk/Documentation/DocBook/Makefile @@ -12,7 +12,8 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ - mac80211.xml debugobjects.xml sh.xml regulator.xml + mac80211.xml debugobjects.xml sh.xml regulator.xml \ + alsa-driver-api.xml writing-an-alsa-driver.xml ### # The build process is as follows (targets): diff --git a/trunk/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl b/trunk/Documentation/DocBook/alsa-driver-api.tmpl similarity index 100% rename from trunk/Documentation/sound/alsa/DocBook/alsa-driver-api.tmpl rename to trunk/Documentation/DocBook/alsa-driver-api.tmpl diff --git a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl similarity index 100% rename from trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl rename to trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl