merge by hand - fix up rejections in Documentation/DocBook/Makefile
authorJames Bottomley <jejb@titanic.(none)>
Fri, 20 May 2005 20:27:44 +0000 (15:27 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Fri, 20 May 2005 20:27:44 +0000 (15:27 -0500)
1  2 
Documentation/DocBook/Makefile
drivers/scsi/Kconfig
drivers/scsi/NCR53C9x.c
drivers/scsi/aacraid/linit.c
drivers/scsi/scsi.c
drivers/scsi/scsi_error.c

index e69d68659455f7aeefc7e9f4edb251387ecf6215,e69b3d2e788436b0db1ecfb38245aeb4aeed0f60..87da3478fada4298d0b2d9c396904e2e3e7fa8f0
@@@ -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):
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge