diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /arch/m68k/kernel/Makefile | |
parent | ftrace: only trace preempt off with preempt tracer (diff) | |
parent | Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/f... (diff) | |
download | linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.xz linux-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'arch/m68k/kernel/Makefile')
-rw-r--r-- | arch/m68k/kernel/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index 7a62a718143b..3a7f62225504 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -16,5 +16,3 @@ devres-y = ../../../kernel/irq/devres.o obj-$(CONFIG_PCI) += bios32.o obj-y$(CONFIG_MMU_SUN3) += dma.o # no, it's not a typo - -EXTRA_AFLAGS := -traditional |