diff options
| author | Paul Mackerras | 2005-10-12 06:43:32 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-10-12 06:43:32 +0200 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /arch/um/sys-x86_64/Makefile | |
| parent | powerpc: make iSeries boot again (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.gz kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.xz kernel-qcow2-linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip | |
Merge from Linus' tree
Diffstat (limited to 'arch/um/sys-x86_64/Makefile')
| -rw-r--r-- | arch/um/sys-x86_64/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/sys-x86_64/Makefile b/arch/um/sys-x86_64/Makefile index f0ab574d1e95..06c3633457a2 100644 --- a/arch/um/sys-x86_64/Makefile +++ b/arch/um/sys-x86_64/Makefile @@ -29,6 +29,4 @@ module.c-dir = kernel $(obj)/stub_segv.o: _c_flags = $(call unprofile,$(CFLAGS)) -subdir- := util - include arch/um/scripts/Makefile.unmap |