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

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

19 files changed, 2 insertions, 38 deletions

diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index 075587459c2c..fe64f389ae78 100644
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -102,4 +102,3 @@ archclean:
 archmrproper:
 
 archdep:
-	@$(MAKEBOOT) dep
diff --git a/arch/cris/boot/Makefile b/arch/cris/boot/Makefile
index 77b59012e946..fe6650368e6a 100644
--- a/arch/cris/boot/Makefile
+++ b/arch/cris/boot/Makefile
@@ -7,8 +7,6 @@ zImage: compressed/vmlinuz
 compressed/vmlinuz: $(TOPDIR)/vmlinux
 	@$(MAKE) -C compressed vmlinuz
 
-dep:
-
 clean:
 	rm -f zImage tools/build compressed/vmlinux.out
 	@$(MAKE) -C compressed clean
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index c307d9355da2..73e47de00623 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -142,4 +142,3 @@ archclean:
 archmrproper:
 
 archdep:
-	@$(MAKEBOOT) dep
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index d7bec772a897..c9fa1ce7e4b9 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -97,8 +97,6 @@ bsetup.o: bsetup.s
 bsetup.s: setup.S video.S Makefile $(BOOT_INCL) $(TOPDIR)/include/linux/version.h $(TOPDIR)/include/linux/compile.h
 	$(CPP) $(CPPFLAGS) -D__BIG_KERNEL__ -D__ASSEMBLY__ -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
 
-dep:
-
 clean:
 	@echo 'Cleaning up (boot)'
 	@rm -f tools/build
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index a7946a23da03..5e0dc3612603 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -128,7 +128,6 @@ archmrproper:
 	@$(MAKE) -C arch/$(ARCH)/tools mrproper
 
 archdep:
-	@$(MAKEBOOT) dep
 
 bootpfile:
 	@$(MAKEBOOT) bootpfile
diff --git a/arch/ia64/boot/Makefile b/arch/ia64/boot/Makefile
index a242056eedee..50c6bff505cf 100644
--- a/arch/ia64/boot/Makefile
+++ b/arch/ia64/boot/Makefile
@@ -23,5 +23,3 @@ bootloader: $(OBJECTS)
 
 clean:
 	rm -f $(TARGETS)
-
-dep:
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 9ef1d89959d0..6720e1e75a08 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -310,7 +310,3 @@ archmrproper:
 	$(MAKE) -C arch/$(ARCH)/tools mrproper
 
 archdep:
-	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
-	 touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
-	fi;
-	@$(MAKEBOOT) dep
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 0376f044afd9..f3840450e32f 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -35,9 +35,6 @@ elf2ecoff: elf2ecoff.c
 addinitrd: addinitrd.c
 	$(HOSTCC) -o $@ $^
 
-# Don't build dependencies, this may die if $(CC) isn't gcc
-dep:
-
 clean:
 	rm -f vmlinux.ecoff
 	rm -f zImage zImage.tmp
diff --git a/arch/mips64/Makefile b/arch/mips64/Makefile
index d141f314a0ea..596bc524e561 100644
--- a/arch/mips64/Makefile
+++ b/arch/mips64/Makefile
@@ -178,7 +178,3 @@ archmrproper:
 	$(MAKE) -C arch/$(ARCH)/tools mrproper
 
 archdep:
-	if [ ! -f $(TOPDIR)/include/asm-$(ARCH)/offset.h ]; then \
-	 touch $(TOPDIR)/include/asm-$(ARCH)/offset.h; \
-	fi;
-	@$(MAKEBOOT) dep
diff --git a/arch/mips64/boot/Makefile b/arch/mips64/boot/Makefile
index e894ee7d7bfa..d714ba2cda56 100644
--- a/arch/mips64/boot/Makefile
+++ b/arch/mips64/boot/Makefile
@@ -26,9 +26,6 @@ elf2ecoff: elf2ecoff.c
 addinitrd: addinitrd.c
 	$(HOSTCC) -o $@ $^
 
-# Don't build dependencies, this may die if $(CC) isn't gcc
-dep:
-
 clean:
 	rm -f vmlinux.ecoff
 
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 5ff2dc352dcd..68a3c591c96b 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -117,5 +117,4 @@ archclean:
 
 archmrproper:
 
-archdep: scripts/mkdep
-	$(MAKEBOOT) fastdep
+archdep:
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 8c489353d9d9..3e27ac194126 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -67,4 +67,4 @@ archclean:
 archmrproper:
 
 archdep:
-	$(MAKEBOOT) fastdep
+	$(MAKEBOOT) dep
diff --git a/arch/ppc64/boot/Makefile b/arch/ppc64/boot/Makefile
index 1fc6d356d843..0dad54b44742 100644
--- a/arch/ppc64/boot/Makefile
+++ b/arch/ppc64/boot/Makefile
@@ -121,9 +121,6 @@ imagesize.c: vmlinux.gz
 clean:
 	rm -f piggyback note addnote $(OBJS) zImage zImage.initrd vmlinux.gz no_initrd.o imagesize.c addSystemMap vmlinux.sm addRamDisk vmlinux.initrd vmlinux.sminitrd 
 
-fastdep:
-	$(TOPDIR)/scripts/mkdep *.[Sch] > .depend
-
 dep:
 	$(CPP) $(CPPFLAGS) -M *.S *.c > .depend
 
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 7ad572164627..dc37126ab7a8 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -59,7 +59,6 @@ archclean:
 archmrproper:
 
 archdep:
-	@$(MAKEBOOT) dep
 
 install: vmlinux
 	@$(MAKEBOOT) BOOTIMAGE=image install
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 9f1169d33d40..9bc623794c8f 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -22,8 +22,6 @@ image: $(TOPDIR)/vmlinux \
 listing: ../../../vmlinux
 	$(OBJDUMP) --disassemble --disassemble-all --disassemble-zeroes --reloc $(TOPDIR)/vmlinux > listing
 
-dep:
-
 clean:
 	rm -f image listing iplfba.boot ipleckd.boot ipldump.boot
 
diff --git a/arch/s390x/Makefile b/arch/s390x/Makefile
index 1598a5015f27..3884ef38441e 100644
--- a/arch/s390x/Makefile
+++ b/arch/s390x/Makefile
@@ -58,4 +58,3 @@ archclean:
 archmrproper:
 
 archdep:
-	@$(MAKEBOOT) dep
diff --git a/arch/s390x/boot/Makefile b/arch/s390x/boot/Makefile
index c89183320b97..22d6f52c6942 100644
--- a/arch/s390x/boot/Makefile
+++ b/arch/s390x/boot/Makefile
@@ -24,8 +24,6 @@ image: $(TOPDIR)/vmlinux \
 listing: ../../../vmlinux
 	$(OBJDUMP) --disassemble --disassemble-all --disassemble-zeroes --reloc $(TOPDIR)/vmlinux > listing
 
-dep:
-
 clean:
 	rm -f image listing iplfba.boot ipleckd.boot ipldump.boot
 
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 7689ff9b993e..d77272e58d53 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -96,4 +96,3 @@ archmrproper:
 	rm -f arch/sh/vmlinux.lds
 
 archdep:
-	@$(MAKEBOOT) dep
diff --git a/arch/sh/boot/Makefile b/arch/sh/boot/Makefile
index cae1f2831dd8..aeb304826d9a 100644
--- a/arch/sh/boot/Makefile
+++ b/arch/sh/boot/Makefile
@@ -25,8 +25,6 @@ install: Image
 zinstall: zImage
 	sh -x ./install.sh $(KERNELRELEASE) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
 
-dep:
-
 clean:
 	rm -f tools/build
 	rm -f setup bootsect zImage compressed/vmlinux.out