diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 16:52:27 -0400 |
| commit | dbbcfb2211761fa69e831a78119c9288fb87eb9d (patch) | |
| tree | b40b103ed250e287bf3d4790f1c87001cf7cf52f /arch/um/Makefile | |
| parent | b0356cd0e7497252a2c45ecb07b79d931390c8b2 (diff) | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
arch/x86/mm/ioremap.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index dbeab15e7bb7..ca40397017b9 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -77,7 +77,6 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) | |||
| 77 | KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \ | 77 | KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \ |
| 78 | -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES)) | 78 | -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES)) |
| 79 | KBUILD_CFLAGS += $(KERNEL_DEFINES) | 79 | KBUILD_CFLAGS += $(KERNEL_DEFINES) |
| 80 | KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,) | ||
| 81 | 80 | ||
| 82 | PHONY += linux | 81 | PHONY += linux |
| 83 | 82 | ||