diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/um/kernel/resource.c | 23 |
2 files changed, 1 insertions, 24 deletions
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile index 6fa63a2a89e3..c5cf4a0827b0 100644 --- a/arch/um/kernel/Makefile +++ b/arch/um/kernel/Makefile | |||
| @@ -7,7 +7,7 @@ extra-y := vmlinux.lds | |||
| 7 | clean-files := | 7 | clean-files := |
| 8 | 8 | ||
| 9 | obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \ | 9 | obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \ |
| 10 | physmem.o process.o ptrace.o reboot.o resource.o sigio.o \ | 10 | physmem.o process.o ptrace.o reboot.o sigio.o \ |
| 11 | signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \ | 11 | signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o uaccess.o \ |
| 12 | um_arch.o umid.o | 12 | um_arch.o umid.o |
| 13 | 13 | ||
diff --git a/arch/um/kernel/resource.c b/arch/um/kernel/resource.c deleted file mode 100644 index 32188e12e8af..000000000000 --- a/arch/um/kernel/resource.c +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2000 Jeff Dike (jdike@karaya.com) | ||
| 3 | * Licensed under the GPL | ||
| 4 | */ | ||
| 5 | |||
| 6 | #include "linux/pci.h" | ||
| 7 | |||
| 8 | unsigned long resource_fixup(struct pci_dev * dev, struct resource * res, | ||
| 9 | unsigned long start, unsigned long size) | ||
| 10 | { | ||
| 11 | return start; | ||
| 12 | } | ||
| 13 | |||
| 14 | /* | ||
| 15 | * Overrides for Emacs so that we follow Linus's tabbing style. | ||
| 16 | * Emacs will notice this stuff at the end of the file and automatically | ||
| 17 | * adjust the settings for this buffer only. This must remain at the end | ||
| 18 | * of the file. | ||
| 19 | * --------------------------------------------------------------------------- | ||
| 20 | * Local variables: | ||
| 21 | * c-file-style: "linux" | ||
| 22 | * End: | ||
| 23 | */ | ||