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

2026-09-14 18:22:56 +00:00 · 2005-05-20 15:27:44 -05:00 · 2005-05-20 15:27:44 -05:00 · ad34ea2cc3
commit ad34ea2cc3
parent 90356ac319 88d7bd8cb9
1285 changed files with 32403 additions and 15847 deletions
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
--- a/drivers/atm/he.h
+++ b/drivers/atm/he.h
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
--- a/drivers/block/DAC960.h
+++ b/drivers/block/DAC960.h
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
--- a/drivers/block/noop-iosched.c
+++ b/drivers/block/noop-iosched.c
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
--- a/drivers/char/ipmi/ipmi_si_sm.h
+++ b/drivers/char/ipmi/ipmi_si_sm.h
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
--- a/drivers/char/mbcs.h
+++ b/drivers/char/mbcs.h
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
--- a/drivers/char/s3c2410-rtc.c
+++ b/drivers/char/s3c2410-rtc.c
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
--- a/drivers/char/snsc.h
+++ b/drivers/char/snsc.h
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
--- a/drivers/input/joystick/spaceorb.c
+++ b/drivers/input/joystick/spaceorb.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
--- a/drivers/isdn/divert/isdn_divert.c
+++ b/drivers/isdn/divert/isdn_divert.c
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
--- a/drivers/md/dm-emc.c
+++ b/drivers/md/dm-emc.c
--- a/drivers/md/dm-hw-handler.c
+++ b/drivers/md/dm-hw-handler.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/md/dm-path-selector.c
+++ b/drivers/md/dm-path-selector.c
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
--- a/drivers/md/dm-zero.c
+++ b/drivers/md/dm-zero.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
--- a/drivers/media/dvb/frontends/cx22702.h
+++ b/drivers/media/dvb/frontends/cx22702.h
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
--- a/Show more
+++ b/Show more