diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /arch/m68k/lib/Makefile | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/lib/Makefile')
| -rw-r--r-- | arch/m68k/lib/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile index a18af095cd7c..af9abf8d9d98 100644 --- a/arch/m68k/lib/Makefile +++ b/arch/m68k/lib/Makefile | |||
| @@ -2,7 +2,5 @@ | |||
| 2 | # Makefile for m68k-specific library files.. | 2 | # Makefile for m68k-specific library files.. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | EXTRA_AFLAGS := -traditional | ||
| 6 | |||
| 7 | lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ | 5 | lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \ |
| 8 | checksum.o string.o uaccess.o | 6 | checksum.o string.o uaccess.o |