It turns out that resource.c isn't needed.
Signed-off-by: Jeff Dike <[email protected]>
--
arch/um/kernel/Makefile | 2 +-
arch/um/kernel/resource.c | 23 -----------------------
2 files changed, 1 insertion(+), 24 deletions(-)
Index: linux-2.6.18-mm/arch/um/kernel/Makefile
===================================================================
--- linux-2.6.18-mm.orig/arch/um/kernel/Makefile 2007-01-08 16:15:33.000000000 -0500
+++ linux-2.6.18-mm/arch/um/kernel/Makefile 2007-01-08 16:16:37.000000000 -0500
@@ -7,7 +7,7 @@ extra-y := vmlinux.lds
clean-files :=
obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \
- physmem.o process.o ptrace.o reboot.o resource.o sigio.o \
+ physmem.o process.o ptrace.o reboot.o sigio.o \
signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \
um_arch.o umid.o
Index: linux-2.6.18-mm/arch/um/kernel/resource.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/kernel/resource.c 2007-01-07 10:51:51.000000000 -0500
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2000 Jeff Dike ([email protected])
- * Licensed under the GPL
- */
-
-#include "linux/pci.h"
-
-unsigned long resource_fixup(struct pci_dev * dev, struct resource * res,
- unsigned long start, unsigned long size)
-{
- return start;
-}
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */