diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-10 14:45:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-10 14:45:06 +1100 |
| commit | 41706a8e4dc9e64cbcb8d9c49d513b7178c00367 (patch) | |
| tree | b8a89e5de51ef1db75701a0fc8d8a90c4f627b67 /Documentation/DocBook/Makefile | |
| parent | c4805cb1533aa7afacf10cfc74ddf87a99f67a63 (diff) | |
| parent | 72ac258369f71aabcce2742b950d4334cf5a7233 (diff) | |
Merge commit 'sound/for-next'
Conflicts:
arch/arm/mach-shark/include/mach/io.h
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'Documentation/DocBook/Makefile')
| -rw-r--r-- | Documentation/DocBook/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 1462ed86d40a..a3a83d38f96f 100644 --- a/Documentation/DocBook/Makefile +++ b/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): |