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

Rules.make

@@ -378,7 +378,7 @@ endif
 # function to only execute the passed command if necessary
 
 if_changed = $(if $(strip $? \
-		          $(filter-out $($(1)),$(cmd_$@))\
-			  $(filter-out $(cmd_$@),$($(1)))),\
-	       @echo $($(1)); $($(1)); echo 'cmd_$@ := $($(1))' > .$@.cmd)
+		          $(filter-out $($(1)),$(cmd_$(@F)))\
+			  $(filter-out $(cmd_$(@F)),$($(1)))),\
+	       @echo $($(1)); $($(1)); echo 'cmd_$(@F) := $($(1))' > $(@D)/.$(@F).cmd)
 

include/linux/uts.h

@@ -8,10 +8,6 @@
 #define UTS_SYSNAME "Linux"
 #endif
 
-#ifndef UTS_MACHINE
-#define UTS_MACHINE "unknown"
-#endif
-
 #ifndef UTS_NODENAME
 #define UTS_NODENAME "(none)"	/* set by sethostname() */
 #endif