Merge http://linux-isdn.bkbits.net/linux-2.5.make

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.isdn

38 files changed, 66 insertions, 233 deletions

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index ec52000ea6f3..4f992e5761dc 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -20,10 +20,11 @@ DOCBOOKS := wanbook.sgml z8530book.sgml mcabook.sgml videobook.sgml \
 # file.tmpl --> file.sgml +--> file.ps  (psdocs)
 #                         +--> file.pdf  (pdfdocs)
 #                         +--> DIR=file  (htmldocs)
+#                         +--> man/      (mandocs)
 
 ###
 # The targets that may be used.
-.PHONY:	sgmldocs psdocs pdfdocs htmldocs clean mrproper
+.PHONY:	sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs
 
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
 sgmldocs: $(BOOKS)
@@ -37,10 +38,18 @@ pdfdocs: $(PDF)
 HTML := $(patsubst %.sgml, %.html, $(BOOKS))
 htmldocs: $(HTML)
 
+MAN := $(patsubst %.sgml, %.9, $(BOOKS))
+mandocs: $(MAN)
+
+installmandocs: mandocs
+	$(MAKEMAN) install Documentation/DocBook/man
+
 ###
 #External programs used
 KERNELDOC = scripts/kernel-doc
 DOCPROC   = scripts/docproc
+SPLITMAN  = $(PERL) $(srctree)/scripts/split-man
+MAKEMAN   = $(PERL) $(srctree)/scripts/makeman
 
 ###
 # DOCPROC is used for two purposes:
@@ -128,6 +137,13 @@ quiet_cmd_db2html = DB2HTML $@
             cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
 
 ###
+# Rule to generate man files - output is placed in the man subdirectory
+
+%.9:	%.sgml
+	$(SPLITMAN) $< $(objtree)/Documentation/DocBook/man "$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)"
+	$(MAKEMAN) convert $(objtree)/Documentation/DocBook/man $<
+
+###
 # Rules to generate postscripts and PNG imgages from .fig format files
 quiet_cmd_fig2eps = FIG2EPS $@
       cmd_fig2eps = fig2dev -Leps $< $@
@@ -157,10 +173,10 @@ quiet_cmd_fig2png = FIG2PNG $@
 # Help targets as used by the top-level makefile
 dochelp:
 	@echo  '  Linux kernel internal documentation in different formats:'
-	@echo  '  sgmldocs (SGML), psdocs (Postscript), pdfdocs (PDF), htmldocs (HTML)'
+	@echo  '  sgmldocs (SGML), psdocs (Postscript), pdfdocs (PDF)'
+	@echo  '  htmldocs (HTML), mandocs (man pages, use installmandocs to install)'
 
 ###
-# clean and mrproper as used by the top-level makefile 
 # Temporary files left by various tools
 clean-files := $(DOCBOOKS) \
 	$(patsubst %.sgml, %.dvi,  $(DOCBOOKS)) \
@@ -171,10 +187,14 @@ clean-files := $(DOCBOOKS) \
 	$(patsubst %.sgml, %.ps,   $(DOCBOOKS)) \
 	$(patsubst %.sgml, %.pdf,  $(DOCBOOKS)) \
 	$(patsubst %.sgml, %.html, $(DOCBOOKS)) \
-	$(patsubst %.fig,%.eps, $(IMG-parportbook)) \
-	$(patsubst %.fig,%.png, $(IMG-parportbook)) \
+	$(patsubst %.sgml, %.9,    $(DOCBOOKS)) \
+	$(patsubst %.fig,%.eps,    $(IMG-parportbook)) \
+	$(patsubst %.fig,%.png,    $(IMG-parportbook)) \
 	$(C-procfs-example)
 
 ifneq ($(wildcard $(patsubst %.html,%,$(HTML))),)
 clean-rule := rm -rf $(wildcard $(patsubst %.html,%,$(HTML)))
 endif
+
+#man put files in man subdir - traverse down
+subdir- := man/
diff --git a/Documentation/DocBook/man/Makefile b/Documentation/DocBook/man/Makefile
new file mode 100644
index 000000000000..4fb7ea0f7ac8
--- /dev/null
+++ b/Documentation/DocBook/man/Makefile
@@ -0,0 +1,3 @@
+# Rules are put in Documentation/DocBook
+
+clean-files := *.9.gz *.sgml manpage.links manpage.refs
diff --git a/Documentation/DocBook/sis900.tmpl b/Documentation/DocBook/sis900.tmpl
index f8d24d47cb10..305b327c8a05 100644
--- a/Documentation/DocBook/sis900.tmpl
+++ b/Documentation/DocBook/sis900.tmpl
@@ -471,8 +471,6 @@ when configuring the kernel. Build the kernel image in the usual way
 </Para>
 
 <Para><screen>
-make dep
-
 make clean
 
 make bzlilo
diff --git a/Documentation/README.DAC960 b/Documentation/README.DAC960
index b6b770ee8dd6..98ea617a0dd6 100644
--- a/Documentation/README.DAC960
+++ b/Documentation/README.DAC960
@@ -212,7 +212,6 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
   patch -p0 < DAC960.patch (if DAC960.patch is included)
   cd linux
   make config
-  make depend
   make bzImage (or zImage)
 
 Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your
diff --git a/Documentation/arm/README b/Documentation/arm/README
index 2f45ddd6781a..482571ae0e31 100644
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
@@ -30,9 +30,9 @@ Compilation of kernel
 	eg.
     CROSS_COMPILE=arm-linux-
 
-  Do a 'make config', followed by 'make dep', and finally 'make Image' to
-  build the kernel (arch/arm/boot/Image).  A compressed image can be built
-  by doing a 'make zImage' instead of 'make Image'.
+  Do a 'make config', followed by 'make Image' to build the kernel 
+  (arch/arm/boot/Image).  A compressed image can be built by doing a 
+  'make zImage' instead of 'make Image'.
 
 
 Bug reports etc
diff --git a/Documentation/arm/SA1100/Assabet b/Documentation/arm/SA1100/Assabet
index 10121a423b10..cbbe5587c78d 100644
--- a/Documentation/arm/SA1100/Assabet
+++ b/Documentation/arm/SA1100/Assabet
@@ -16,7 +16,6 @@ To build the kernel with current defaults:
 
 	make assabet_config
 	make oldconfig
-	make dep
 	make zImage
 
 The resulting kernel image should be available in linux/arch/arm/boot/zImage.
diff --git a/Documentation/arm/SA1100/Brutus b/Documentation/arm/SA1100/Brutus
index 98373152fc51..2254c8f0b326 100644
--- a/Documentation/arm/SA1100/Brutus
+++ b/Documentation/arm/SA1100/Brutus
@@ -8,7 +8,6 @@ To compile for Brutus, you must issue the following commands:
 	make brutus_config
 	make config
 	[accept all the defaults]
-	make dep
 	make zImage
 
 The resulting kernel will end up in linux/arch/arm/boot/zImage.  This file
diff --git a/Documentation/arm/SA1100/CERF b/Documentation/arm/SA1100/CERF
index 83354dd7ec3d..bf50c6fdd572 100644
--- a/Documentation/arm/SA1100/CERF
+++ b/Documentation/arm/SA1100/CERF
@@ -26,7 +26,6 @@ will suffice:
 
    make cerf_config
    make xconfig
-   make dep
    make zImage
    cp arch/arm/boot/zImage <TFTP directory>
 
diff --git a/Documentation/arm/SA1100/HUW_WEBPANEL b/Documentation/arm/SA1100/HUW_WEBPANEL
index ffc81818ac29..fd56b48d4833 100644
--- a/Documentation/arm/SA1100/HUW_WEBPANEL
+++ b/Documentation/arm/SA1100/HUW_WEBPANEL
@@ -7,7 +7,6 @@ To build the kernel:
 	make huw_webpanel_config
 	make oldconfig
 	[accept all defaults]
-	make dep
 	make zImage
 
 Mostly of the work is done by:
diff --git a/Documentation/arm/SA1100/Itsy b/Documentation/arm/SA1100/Itsy
index ed62bdf84c31..3b594534323b 100644
--- a/Documentation/arm/SA1100/Itsy
+++ b/Documentation/arm/SA1100/Itsy
@@ -13,7 +13,7 @@ serial console (to see what you're doing).  No other devices have been
 enabled.
 
 To build, do a "make menuconfig" (or xmenuconfig) and select Itsy support.
-Disable Flash and LCD support. and then do a make dep and a make zImage.
+Disable Flash and LCD support. and then do a make zImage.
 Finally, you will need to cd to arch/arm/boot/tools and execute a make there
 to build the params-itsy program used to boot the kernel.
 
diff --git a/Documentation/arm/SA1100/Pangolin b/Documentation/arm/SA1100/Pangolin
index e885a6b4bb24..077a6120e129 100644
--- a/Documentation/arm/SA1100/Pangolin
+++ b/Documentation/arm/SA1100/Pangolin
@@ -8,7 +8,6 @@ To compile for Pangolin, you must issue the following commands:
 
 	make pangolin_config
 	make oldconfig
-	make dep
 	make zImage
 
 Supported peripherals:
diff --git a/Documentation/arm/XScale/ADIFCC/80200EVB b/Documentation/arm/XScale/ADIFCC/80200EVB
index 1be2f340eb78..3762de418f56 100644
--- a/Documentation/arm/XScale/ADIFCC/80200EVB
+++ b/Documentation/arm/XScale/ADIFCC/80200EVB
@@ -35,7 +35,6 @@ Building the Kernel
 change Linux makefile
 make adi_evb_config
 make oldconfig
-make dep
 make zImage
 
 Loading Linux
diff --git a/Documentation/arm/XScale/IOP3XX/IQ80310 b/Documentation/arm/XScale/IOP3XX/IQ80310
index d1d122747df1..5312a5742104 100644
--- a/Documentation/arm/XScale/IOP3XX/IQ80310
+++ b/Documentation/arm/XScale/IOP3XX/IQ80310
@@ -39,7 +39,6 @@ Building the Kernel
 -----------------------------
 make iq80310_config
 make oldconfig
-make dep
 make zImage
 
 This will build an image setup for BOOTP/NFS root support.  To change this,
diff --git a/Documentation/arm/XScale/IOP3XX/IQ80321 b/Documentation/arm/XScale/IOP3XX/IQ80321
index 18d22175108b..e3253279dfd9 100644
--- a/Documentation/arm/XScale/IOP3XX/IQ80321
+++ b/Documentation/arm/XScale/IOP3XX/IQ80321
@@ -37,7 +37,6 @@ Building the Kernel
 -----------------------------
 make iq80321_config
 make oldconfig
-make dep
 make zImage
 
 This will build an image setup for BOOTP/NFS root support.  To change this,
diff --git a/Documentation/cdrom/cm206 b/Documentation/cdrom/cm206
index bc4f9e656544..810368f4f7c4 100644
--- a/Documentation/cdrom/cm206
+++ b/Documentation/cdrom/cm206
@@ -56,7 +56,7 @@ Compiling the kernel
 
 2) then do a 
 	
-	make dep; make clean; make zImage; make modules
+	make clean; make zImage; make modules
 
 3) do the usual things to install a new image (backup the old one, run
    `rdev -R zImage 1', copy the new image in place, run lilo).  Might
diff --git a/Documentation/cdrom/gscd b/Documentation/cdrom/gscd
index 560069e2a94a..d01ca36b5c43 100644
--- a/Documentation/cdrom/gscd
+++ b/Documentation/cdrom/gscd
@@ -37,7 +37,7 @@ configuration for your kernel. If you want to use the GoldStar driver
 like a module, don't select 'GoldStar CDROM support'. By the way, you
 have to include the iso9660 filesystem.
 
-Now start compiling the kernel with 'make dep ; make zImage'.
+Now start compiling the kernel with 'make zImage'.
 If you want to use the driver as a module, you have to do 'make modules' 
 and 'make modules_install', additionally.
 Install your new kernel as usual - maybe you do it with 'make zlilo'.
diff --git a/Documentation/cdrom/sbpcd b/Documentation/cdrom/sbpcd
index 47efedf9194c..c99ae51e78b3 100644
--- a/Documentation/cdrom/sbpcd
+++ b/Documentation/cdrom/sbpcd
@@ -229,7 +229,7 @@ To install:
    second, third, or fourth controller installed, do not say "y" to the 
    secondary Matsushita CD-ROM questions.
 
-3. Then do a "make dep", then make the kernel image ("make zlilo" or similar).
+3. Then make the kernel image ("make zlilo" or similar).
 
 4. Make the device file(s). This step usually already has been done by the
    MAKEDEV script.
diff --git a/Documentation/computone.txt b/Documentation/computone.txt
index 1bc1dd454a65..b62c34f98ff7 100644
--- a/Documentation/computone.txt
+++ b/Documentation/computone.txt
@@ -60,12 +60,11 @@ c) Set address on ISA cards then:
 	or
    edit /etc/modules.conf if needed (module).
 	or both to match this setting.
-d) Run "make dep"
-e) Run "make modules"
-f) Run "make modules_install"
-g) Run "/sbin/depmod -a"
-h) install driver using `modprobe ip2 <options>` (options listed below)
-i) run ip2mkdev (either the script below or the binary version)
+d) Run "make modules"
+e) Run "make modules_install"
+f) Run "/sbin/depmod -a"
+g) install driver using `modprobe ip2 <options>` (options listed below)
+h) run ip2mkdev (either the script below or the binary version)
 
 
 Kernel installation:
@@ -77,13 +76,12 @@ b) Run "make config" or "make menuconfig" or "make xconfig"
 c) Set address on ISA cards then:
 	   edit /usr/src/linux/drivers/char/ip2.c  
            (Optional - may be specified on kernel command line now)
-d) Run "make dep"
-e) Run "make zImage" or whatever target you prefer.
-f) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
-g) Add new config for this kernel into /etc/lilo.conf, run "lilo"
+d) Run "make zImage" or whatever target you prefer.
+e) mv /usr/src/linux/arch/i386/boot/zImage to /boot.
+f) Add new config for this kernel into /etc/lilo.conf, run "lilo"
 	or copy to a floppy disk and boot from that floppy disk.
-h) Reboot using this kernel
-i) run ip2mkdev (either the script below or the binary version)
+g) Reboot using this kernel
+h) run ip2mkdev (either the script below or the binary version)
 
 Kernel command line options:
 
@@ -176,7 +174,6 @@ all cards will operate in polled mode.
 
 If you select the driver as part of the kernel run :
 
-	make depend
 	make zlilo (or whatever you do to create a bootable kernel)
 
 If you selected a module run :
diff --git a/Documentation/filesystems/devfs/README b/Documentation/filesystems/devfs/README
index c4516620de42..3ef858266450 100644
--- a/Documentation/filesystems/devfs/README
+++ b/Documentation/filesystems/devfs/README
@@ -710,9 +710,8 @@ The Kernel
 Finally, you need to make sure devfs is compiled into your kernel. Set
 CONFIG_EXPERIMENTAL=y, CONFIG_DEVFS_FS=y and CONFIG_DEVFS_MOUNT=y by
 using favourite configuration tool (i.e. make config or
-make xconfig) and then make dep; make clean and then
-recompile your kernel and modules. At boot, devfs will be mounted onto
-/dev.
+make xconfig) and then make clean and then recompile your kernel and 
+modules. At boot, devfs will be mounted onto /dev.
 
 If you encounter problems booting (for example if you forgot a
 configuration step), you can pass devfs=nomount at the kernel
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index a9029185b1ae..031c8d814337 100644
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -504,7 +504,7 @@ to e.g. the Internet:
      cd /usr/src/linux
      make menuconfig
      <ISDN subsystem - ISDN support -- HiSax>
-     make clean; make dep; make zImage; make modules; make modules_install
+     make clean; make zImage; make modules; make modules_install
 2. Install the new kernel
      cp /usr/src/linux/arch/i386/boot/zImage /etc/kernel/linux.isdn
      vi /etc/lilo.conf
diff --git a/Documentation/kbuild/00-INDEX b/Documentation/kbuild/00-INDEX
index 03db5e5d208d..ca00fb379328 100644
--- a/Documentation/kbuild/00-INDEX
+++ b/Documentation/kbuild/00-INDEX
@@ -1,10 +1,6 @@
 00-INDEX
     	- this file: info on the kernel build process
-commands.txt
-	- overview of kbuild commands
 kconfig-language.txt
 	- specification of Config Language, the language in Kconfig files
-random.txt
-	- description of generic config targets
 makefiles.txt
 	- developer information for linux kernel makefiles
diff --git a/Documentation/kbuild/commands.txt b/Documentation/kbuild/commands.txt
deleted file mode 100644
index d61e1a16e75c..000000000000
--- a/Documentation/kbuild/commands.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-Overview of Kbuild Commands
-24 January 1999
-Michael Elizabeth Chastain, <mailto:mec@shout.net>
-
-
-
-=== Introduction
-
-Someday we'll get our arms around all this stuff and clean it up
-a little!  Meanwhile, this file describes the system as it is today.
-
-
-
-=== Quick Start
-
-If you are building a kernel for the first time, here are the commands
-you need:
-
-    make config
-    make dep
-    make bzImage
-
-Instead of 'make config', you can run 'make menuconfig' for a full-screen
-text interface, or 'make xconfig' for an X interface using TCL/TK.
-
-'make bzImage' will leave your new kernel image in arch/i386/boot/bzImage.
-You can also use 'make bzdisk' or 'make bzlilo'.
-
-See the lilo documentation for more information on how to use lilo.
-You can also use the 'loadlin' program to boot Linux from MS-DOS.
-
-Some computers won't work with 'make bzImage', either due to hardware
-problems or very old versions of lilo or loadlin.  If your kernel image
-is small, you may use 'make zImage', 'make zdisk', or 'make zlilo'
-on theses systems.
-
-If you find a file name 'vmlinux' in the top directory of the source tree,
-just ignore it.  This is an intermediate file and you can't boot from it.
-
-Other architectures: the information above is oriented towards the
-i386.  On other architectures, there are no 'bzImage' files; simply
-use 'zImage' or 'vmlinux' as appropriate for your architecture.
-
-Note: the difference between 'zImage' files and 'bzImage' files is that
-'bzImage' uses a different layout and a different loading algorithm,
-and thus has a larger capacity.  Both files use gzip compression.
-The 'bz' in 'bzImage' stands for 'big zImage', not for 'bzip'!
-
-
-
-=== Top Level Makefile targets
-
-Here are the targets available at the top level:
-
-    make config, make oldconfig, make menuconfig, make xconfig
-
-	Configure the Linux kernel.  You must do this before almost
-	anything else.
-
-	config		line-oriented interface
-	oldconfig	line-oriented interface, re-uses old values
-	menuconfig	curses-based full-screen interface
-	xconfig		X window system interface
-
-    make checkconfig
-
-	This runs a little perl script that checks the source tree for
-	missing instances of #include <linux/config.h>.  Someone needs to
-	do this occasionally, because the C preprocessor will silently give
-	bad results if these symbols haven't been included (it treats
-	undefined symbols in preprocessor directives as defined to 0).
-	Superfluous uses of #include <linux/config.h> are also reported,
-	but you can ignore these, because smart CONFIG_* dependencies
-	make them harmless.
-
-	You can run 'make checkconfig' without configuring the kernel.
-	Also, 'make checkconfig' does not modify any files.
-
-    make checkhelp
-
-	This runs another little perl script that checks the source tree
-	for options that are in Config.in files but are not documented
-	in scripts/Configure.help.  Again, someone needs to do this
-	occasionally.  If you are adding configuration options, it's
-	nice if you do it before you publish your patch!
-
-	You can run 'make checkhelp' without configuring the kernel.
-	Also, 'make checkhelp' does not modify any files.
-
-    make dep, make depend
-
-	'make dep' is a synonym for the long form, 'make depend'.
-
-	This command does two things.  First, it computes dependency
-	information about which .o files depend on which .h files.
-	It records this information in a top-level file named .hdepend
-	and in one file per source directory named .depend.
-
-	Second, if you have CONFIG_MODVERSIONS enabled, 'make dep'
-	computes symbol version information for all of the files that
-	export symbols (note that both resident and modular files may
-	export symbols).
-
-	If you do not enable CONFIG_MODVERSIONS, you only have to run
-	'make dep' once, right after the first time you configure
-	the kernel.  The .hdepend files and the .depend file are
-	independent of your configuration.
-
-	If you do enable CONFIG_MODVERSIONS, you must run 'make dep'
-	every time you change your configuration, because the module
-	symbol version information depends on the configuration.
-
-[to be continued ...]
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 58624e4bae80..019558520b35 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -216,8 +216,8 @@ more details, with real examples.
 
 --- 3.5 Library file goals - lib-y
 
-	Objects listed with obj-* is used for modules or
-	are combined in a built-in.o for that specific directory.
+	Objects listed with obj-* are used for modules or
+	combined in a built-in.o for that specific directory.
 	There is also the possibility to list objects that will
 	be included in a library, lib.a.
 	All objects listed with lib-y are combined in a single
diff --git a/Documentation/kbuild/random.txt b/Documentation/kbuild/random.txt
deleted file mode 100644
index 02a23c583687..000000000000
--- a/Documentation/kbuild/random.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Code by Ghozlane Toumi <gtoumi@messel.emse.fr>, documentation by
-Keith Owens <kaos@ocs.com.au>
-
-In addition to the normal config targets you can make
-
-  randconfig	random configuration.
-
-  allyes	reply 'y' to all options, maximal kernel.
-
-  allno		reply 'n' to all options, minimal kernel.
-
-  allmod	build everything as modules where possible.
-
-
-All random configurations will satisfy the config rules, that is, all
-configurations should be valid.  Any build errors indicate bugs in the
-config dependency rules or in the Makefiles.
-
-You can constrain the random configuration, e.g. you may want to force
-the use of modules or the absence of /proc or cramfs must be a module.
-If file .force_default exists then it is read to preset selected
-values, all other values will be randomly selected, subject to the
-config rules.  The syntax of .force_default is:
-
-CONFIG_foo=value
-  Force this value, for example CONFIG_MODULES=y, CONFIG_PROC_FS=n,
-  CONFIG_RAMFS=m.
-
-# CONFIG_foo is not set
-  Equivalent to CONFIG_foo=n, supported because this is the format used
-  in .config.  NOTE: The leading '#' is required.
-
-# list CONFIG_foo val1,val2,val3
-  Pick a value for CONFIG_foo from the list.  CONFIG_foo must be an int
-  or hex option.  NOTE: The leading '#' is required.
-
-# range CONFIG_foo min max
-  Pick a value for CONFIG_foo in the range min <=> max.  CONFIG_foo
-  must be an int option.  NOTE: The leading '#' is required.
-
-If you have repeated settings of the same option in .force_default then
-values take precedence over lists which take precedence over range.
-Within each group the last setting for an option is used.
-
-Answers "randomised" are bool(), tristate(), dep_tristate() and
-choice().  Unless specified in .force_default, int, hex, and string
-options use the default values from config.in.
diff --git a/Documentation/moxa-smartio b/Documentation/moxa-smartio
index 75efa68409d7..fe24ecc6372e 100644
--- a/Documentation/moxa-smartio
+++ b/Documentation/moxa-smartio
@@ -254,19 +254,18 @@ Content
 
 	   a. cd /usr/src/linux
 	   b. make clean			     /* take a few minutes */
-	   c. make dep				     /* take a few minutes */
-	   d. make bzImage		   /* take probably 10-20 minutes */
-	   e. Backup original boot kernel.		  /* optional step */
-	   f. cp /usr/src/linux/arch/i386/boot/bzImage /boot/vmlinuz
-	   g. Please make sure the boot kernel (vmlinuz) is in the
+	   c. make bzImage		   /* take probably 10-20 minutes */
+	   d. Backup original boot kernel.		  /* optional step */
+	   e. cp /usr/src/linux/arch/i386/boot/bzImage /boot/vmlinuz
+	   f. Please make sure the boot kernel (vmlinuz) is in the
 	      correct position. If you use 'lilo' utility, you should
 	      check /etc/lilo.conf 'image' item specified the path
 	      which is the 'vmlinuz' path, or you will load wrong
 	      (or old) boot kernel image (vmlinuz).
-	   h. chmod 400 /vmlinuz
-	   i. lilo
-	   j. rdev -R /vmlinuz 1
-	   k. sync
+	   g. chmod 400 /vmlinuz
+	   h. lilo
+	   i. rdev -R /vmlinuz 1
+	   j. sync
 
 	  Note that if the result of "make zImage" is ERROR, then you have to
 	  go back to Linux configuration Setup. Type "make config" in directory
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
index efbf441bae40..083d24752b83 100644
--- a/Documentation/networking/DLINK.txt
+++ b/Documentation/networking/DLINK.txt
@@ -93,7 +93,6 @@ Released 1994-06-13
 	  (else included in the kernel:)
 	  #  make config (answer yes on CONFIG _NET, _INET and _DE600 or _DE620)
 	  # make clean
-	  # make depend
 	  # make zImage (or whatever magic you usually do)
 
 	o I use lilo to boot multiple kernels, so that I at least
diff --git a/Documentation/networking/arcnet.txt b/Documentation/networking/arcnet.txt
index 86188673f97a..bf13f782e38c 100644
--- a/Documentation/networking/arcnet.txt
+++ b/Documentation/networking/arcnet.txt
@@ -108,7 +108,6 @@ All you will need to do in order to install the driver is:
 	make config
 		(be sure to choose ARCnet in the network devices 
 		and at least one chipset driver.)
-	make dep
 	make clean
 	make zImage
 	
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 386a101133dd..188beb7d6a17 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -437,8 +437,8 @@ Also add:
 into the /usr/src/linux/drivers/net directory.
 
 
-3.) Go to /usr/src/linux directory and run 'make config' followed by 'make dep' 
-and finally 'make' (or make bzImage) to rebuild the kernel. 
+3.) Go to /usr/src/linux directory and run 'make config' followed by 'make' 
+(or make bzImage) to rebuild the kernel. 
 
 4.) Use the DOS 'setup' utility to disable plug and play on the NIC.
 
diff --git a/Documentation/networking/sis900.txt b/Documentation/networking/sis900.txt
index cab486f5ba8a..bddffd7385ae 100644
--- a/Documentation/networking/sis900.txt
+++ b/Documentation/networking/sis900.txt
@@ -215,8 +215,6 @@ Building the driver into kernel
    on "SiS 900/7016 PCI Fast Ethernet Adapter support" when configuring
    the kernel. Build the kernel image in the usual way
    
-make dep
-
 make clean
 
 make bzlilo
diff --git a/Documentation/s390/3270.txt b/Documentation/s390/3270.txt
index 33b4ff6a6be3..d06900379b55 100644
--- a/Documentation/s390/3270.txt
+++ b/Documentation/s390/3270.txt
@@ -79,7 +79,6 @@ Here are the installation steps in detail:
 		(If you wish to disable 3215 console support, edit
 		.config; change CONFIG_TN3215's value to "n";
 		and rerun "make oldconfig".)
-		make dep
 		make image
 		make modules
 		make modules_install
diff --git a/Documentation/scsi/BusLogic.txt b/Documentation/scsi/BusLogic.txt
index 3ddc8b1f10a9..2ef5db0452b0 100644
--- a/Documentation/scsi/BusLogic.txt
+++ b/Documentation/scsi/BusLogic.txt
@@ -597,7 +597,6 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree:
   patch -p0 < BusLogic.patch (only for 2.0.33 and below)
   cd linux
   make config
-  make depend
   make zImage
 
 Then install "arch/i386/boot/zImage" as your standard kernel, run lilo if
diff --git a/Documentation/scsi/cpqfc.txt b/Documentation/scsi/cpqfc.txt
index d257e34a4443..dd33e61c0645 100644
--- a/Documentation/scsi/cpqfc.txt
+++ b/Documentation/scsi/cpqfc.txt
@@ -102,7 +102,6 @@ using "qa_test" (esp. io_test script) suite modified from Unix tests.
 Installation:
 make menuconfig
   (select SCSI low-level, Compaq FC HBA)
-make dep
 make modules
 make modules_install
 
diff --git a/Documentation/smp.txt b/Documentation/smp.txt
index 130d6478ac8c..82fc50b6305d 100644
--- a/Documentation/smp.txt
+++ b/Documentation/smp.txt
@@ -15,7 +15,7 @@ with this one.
 Of course you should time how long each build takes :-)
 Example:
    make config
-   time -v sh -c 'make dep ; make clean install modules modules_install'
+   time -v sh -c 'make clean install modules modules_install'
 
 If you are using some Compaq MP compliant machines you will need to set
 the operating system in the BIOS settings to "Unixware" - don't ask me
diff --git a/Documentation/sound/oss/Introduction b/Documentation/sound/oss/Introduction
index 90b41f8c3b4c..d6d5f33dc114 100644
--- a/Documentation/sound/oss/Introduction
+++ b/Documentation/sound/oss/Introduction
@@ -114,8 +114,7 @@ the README takes precedence.
     Blaster, etc., select M (module) for OSS sound modules.
     [thanks to Marvin Stodolsky <stodolsk@erols.com>]A
 
-5.  Make the kernel (e.g., make dep ; make bzImage), and install
-    the kernel.
+5.  Make the kernel (e.g., make bzImage), and install the kernel.
 
 6.  Make the modules and install them (make modules; make modules_install).
 
diff --git a/Documentation/sound/oss/README.OSS b/Documentation/sound/oss/README.OSS
index ac1eaf5e977d..fd42b05b2f55 100644
--- a/Documentation/sound/oss/README.OSS
+++ b/Documentation/sound/oss/README.OSS
@@ -722,8 +722,8 @@ To configure the driver, run "make config" in the kernel source directory
 (after the questions about mouse, CD-ROM, ftape, etc. support).  Questions
 about options for sound will then be asked.
 
-After configuring the kernel and sound driver, run "make dep" and compile
-the kernel following instructions in the kernel README.
+After configuring the kernel and sound driver and compile the kernel 
+following instructions in the kernel README.
 
 The sound driver configuration dialog
 -------------------------------------
diff --git a/Documentation/sound/oss/Wavefront b/Documentation/sound/oss/Wavefront
index 3b936a2bcc65..803ffd408c2a 100644
--- a/Documentation/sound/oss/Wavefront
+++ b/Documentation/sound/oss/Wavefront
@@ -139,7 +139,6 @@ PART THREE: configure your kernel
 	      soundcards you want support for)
 
 
-   make dep
    make boot
    .
    .
diff --git a/Documentation/telephony/ixj.txt b/Documentation/telephony/ixj.txt
index ce67a823c33d..621024fd3a18 100644
--- a/Documentation/telephony/ixj.txt
+++ b/Documentation/telephony/ixj.txt
@@ -363,7 +363,7 @@ modules.  The command string for the final compile looks like this:
     1.  cp .config /tmp
     2.  make mrproper
     3.  cp /tmp/.config .
-    4.	make dep;make clean;make bzImage;make modules;make modules_install
+    4.	make clean;make bzImage;make modules;make modules_install
 
 This rebuilds both the kernel and all the modules and makes sure they all 
 have the same linkages.  This generally solves the problem once the new 
diff --git a/Documentation/video4linux/CQcam.txt b/Documentation/video4linux/CQcam.txt
index 8bbe61103905..3c5d25da80f7 100644
--- a/Documentation/video4linux/CQcam.txt
+++ b/Documentation/video4linux/CQcam.txt
@@ -50,8 +50,7 @@ configuration.  The appropriate flags are:
   With these flags, the kernel should compile and install the modules.
 To record and monitor the compilation, I use:
 
- (make dep; \
-  make zlilo ; \
+ (make zlilo ; \
   make modules; \
   make modules_install ; 
   depmod -a ) &>log &