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

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

Documentation/DocBook/Makefile

@@ -12,17 +12,30 @@ EPS-parportbook := $(patsubst %.fig, %.eps, $(IMG-parportbook))
 PNG-parportbook := $(patsubst %.fig, %.png, $(IMG-parportbook))
 C-procfs-example = procfs_example.sgml
 
-books:	$(BOOKS)
+$(TOPDIR)/scripts/docgen: dummy
+	chmod 755 $(TOPDIR)/scripts/docgen
 
-$(BOOKS): $(TOPDIR)/scripts/docproc
+$(TOPDIR)/scripts/gen-all-syms: dummy
+	chmod 755 $(TOPDIR)/scripts/gen-all-syms
 
-.PHONY:	books ps pdf html clean mrproper
+$(TOPDIR)/scripts/kernel-doc: dummy
+	chmod 755 $(TOPDIR)/scripts/kernel-doc
 
-ps:	$(PS)
+$(TOPDIR)/scripts/docproc: dummy
+	$(MAKE) -C $(TOPDIR)/scripts docproc
+
+$(BOOKS): $(TOPDIR)/scripts/docgen $(TOPDIR)/scripts/gen-all-syms \
+	  $(TOPDIR)/scripts/kernel-doc $(TOPDIR)/scripts/docproc
+
+.PHONY:	sgmldocs psdocs pdfdocs htmldocs clean mrproper
+
+sgmldocs: $(BOOKS)
 
-pdf:	$(PDF)
+psdocs: $(PS)
 
-html:	$(HTML)
+pdfdocs: $(PDF)
+
+htmldocs: $(HTML)
 
 %.eps: %.fig
 	fig2dev -Leps $< $@
@@ -39,9 +52,6 @@ html:	$(HTML)
 	echo "</programlisting>" >> $@
 
 
-$(TOPDIR)/scripts/docproc:
-	$(MAKE) -C $(TOPDIR)/scripts docproc
-
 mousedrivers.sgml: mousedrivers.tmpl
 	$(TOPDIR)/scripts/docgen <$< >$@
 

arch/i386/boot/Makefile

@@ -8,6 +8,25 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
+# ROOT_DEV specifies the default root-device when making the image.
+# This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case
+# the default of FLOPPY is used by 'build'.
+
+ROOT_DEV := CURRENT
+
+# If you want to preset the SVGA mode, uncomment the next line and
+# set SVGA_MODE to whatever number you want.
+# Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode.
+# The number is the same as you would ordinarily press at bootup.
+
+SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
+
+# If you want the RAM disk device, define this to be the size in blocks.
+
+RAMDISK := -DRAMDISK=512
+
+# ---------------------------------------------------------------------------
+
 BOOT_INCL =	$(TOPDIR)/include/linux/config.h \
 		$(TOPDIR)/include/linux/autoconf.h \
 		$(TOPDIR)/include/asm/boot.h

arch/x86_64/boot/Makefile

@@ -8,6 +8,25 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
+# ROOT_DEV specifies the default root-device when making the image.
+# This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case
+# the default of FLOPPY is used by 'build'.
+
+ROOT_DEV := CURRENT
+
+# If you want to preset the SVGA mode, uncomment the next line and
+# set SVGA_MODE to whatever number you want.
+# Set it to -DSVGA_MODE=NORMAL_VGA if you just want the EGA/VGA mode.
+# The number is the same as you would ordinarily press at bootup.
+
+SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
+
+# If you want the RAM disk device, define this to be the size in blocks.
+
+RAMDISK := -DRAMDISK=512
+
+# ---------------------------------------------------------------------------
+
 BOOT_INCL =	$(TOPDIR)/include/linux/config.h \
 		$(TOPDIR)/include/linux/autoconf.h \
 		$(TOPDIR)/include/asm/boot.h

drivers/pcmcia/Makefile

@@ -44,6 +44,6 @@ sa1100_cs-objs-$(CONFIG_SA1100_STORK)		+= sa1100_stork.o
 sa1100_cs-objs-$(CONFIG_SA1100_TRIZEPS) 	+= sa1100_trizeps.o
 sa1100_cs-objs-$(CONFIG_SA1100_XP860)		+= sa1100_xp860.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_YOPY)		+= sa1100_yopy.o
-sa1100_cs-objs					:= $(sa11000_cs-objs-y)
+sa1100_cs-objs					:= $(sa1100_cs-objs-y)
 
 include $(TOPDIR)/Rules.make

scripts/mkcompile_h

+TARGET=$1
+ARCH=$2
+SMP=$3
+CC=$4
+
+# Generate a temporary compile.h
+
+( echo /\* This file is auto generated, version `cat .version` \*/
+
+  echo \#define UTS_MACHINE \"$ARCH\"
+
+  echo -n \#define UTS_VERSION \"\#`cat .version`
+  if [ -n "$SMP" ] ; then echo -n " SMP"; fi
+  echo ' '`date`'"'
+
+  echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
+  echo \#define LINUX_COMPILE_BY \"`whoami`\"
+  echo \#define LINUX_COMPILE_HOST \"`hostname`\"
+
+  if [ -x /bin/dnsdomainname ]; then
+    echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname`\"
+  elif [ -x /bin/domainname ]; then
+    echo \#define LINUX_COMPILE_DOMAIN \"`domainname`\"
+  else
+    echo \#define LINUX_COMPILE_DOMAIN
+  fi
+
+  echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -1`\"
+) > .tmpcompile
+
+# Only replace the real compile.h if the new one is different,
+# in order to preserve the timestamp and avoid unnecessary
+# recompilations.
+# We don't consider the file changed if only the date/time changed.
+# A kernel config change will increase the generation number, thus
+# causing compile.h to be updated (including date/time) due to the 
+# changed comment in the
+# first line.
+
+if [ -r $TARGET ] && \
+      grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
+      grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
+      cmp -s .tmpver.1 .tmpver.2; then
+   echo $TARGET is unchanged;
+   rm -f .tmpcompile
+else
+   mv -f .tmpcompile $TARGET
+fi
+rm -f .tmpver.1 .tmpver.2

scripts/mkversion_h

+TARGET=$1
+KERNELRELEASE=$2
+VERSION=$3
+PATCHLEVEL=$4
+SUBLEVEL=$5
+
+# Generate a temporary version.h
+
+( echo \#define UTS_RELEASE \"$KERNELRELEASE\"
+  echo \#define LINUX_VERSION_CODE `expr $VERSION \\* 65536 + $PATCHLEVEL \\* 256 + $SUBLEVEL`
+  echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
+) > .tmpversion
+
+mv -f .tmpversion $TARGET
\ No newline at end of file