From: James Bottomley <jejb@titanic.(none)>
Date: Fri, 20 May 2005 20:27:44 +0000 (-0500)
Subject: merge by hand - fix up rejections in Documentation/DocBook/Makefile
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672;p=linux-edison.git

merge by hand - fix up rejections in Documentation/DocBook/Makefile
---

ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672
diff --cc Documentation/DocBook/Makefile
index e69d6865945,e69b3d2e788..87da3478fad
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -7,11 -7,10 +7,10 @@@
  # list of DOCBOOKS.
  
  DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
- 	    kernel-hacking.xml kernel-locking.xml via-audio.xml \
- 	    deviceiobook.xml procfs-guide.xml tulip-user.xml \
- 	    writing_usb_driver.xml sis900.xml kernel-api.xml \
- 	    journal-api.xml lsm.xml usb.xml gadget.xml libata.xml \
- 	    mtdnand.xml librs.xml
+ 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
 -	    procfs-guide.xml writing_usb_driver.xml scsidrivers.xml \
++	    procfs-guide.xml writing_usb_driver.xml \
+ 	    sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \
+ 	    gadget.xml libata.xml mtdnand.xml librs.xml
  
  ###
  # The build process is as follows (targets):