Some small build fixes to the IP checksum merge.

arch/um/kernel/Makefile

@@ -5,9 +5,9 @@
 
 EXTRA_TARGETS	:= unmap_fin.o
 
-obj-y = config.o exec_kern.o exitcode.o frame_kern.o frame.o helper.o \
-	init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o process.o \
-	process_kern.o ptrace.o reboot.o resource.o sigio_user.o \
+obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
+	helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
+	process.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \
 	sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o \
 	syscall_user.o sysrq.o sys_call_table.o tempfile.o time.o \
 	time_kern.o tlb.o trap_kern.o trap_user.o um_arch.o \

arch/um/os-Linux/Makefile

@@ -3,14 +3,14 @@
 # Licensed under the GPL
 #
 
-obj-y = file.o process.o tty.o
+obj-y = file.o process.o tty.o drivers/
 
-USER_OBJS := $(foreach file,$(obj-y),arch/um/os-Linux/$(file))
+USER_OBJS := $(foreach file,file.o process.o tty.o,$(obj)/$(file))
 
 include $(TOPDIR)/Rules.make
 
 $(USER_OBJS) : %.o: %.c
-	$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
 
 clean :
 

arch/um/os-Linux/drivers/Makefile

@@ -13,8 +13,9 @@ obj-$(CONFIG_UML_NET_TUNTAP) += tuntap.o
 USER_SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y)),$($(f)-objs))
 
 USER_OBJS = $(filter %_user.o,$(obj-y) $(USER_SINGLE_OBJS))
+USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
 
 include $(TOPDIR)/Rules.make
 
 $(USER_OBJS) : %.o: %.c
-	$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<