diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 09:50:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-13 09:50:26 -0700 |
| commit | ecaedfa385a6df297e17d6e9f296cc63f12c053f (patch) | |
| tree | 236a4484cdb04f73f8f365ae46a1741eb0d9ce54 /arch/sh64/mm/Makefile | |
| parent | dcf397f037f52add9945eced57ca300ab6a4413c (diff) | |
| parent | cb0f3fe08d4718cfe6cf7b50d0fb2732e5e5459d (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: mach-cayman: Build fixes.
sh64: Symbol export fixups.
sh64: linker script tidying and alignment fixups.
sh64: Set KBUILD_IMAGE to make the rpm target happy.
sh64: Kill off obsolete linux/blk.h reference.
sh64: cleanup struct irqaction initializers.
sh64: Kill off dead gdb stub symbol.
sh64: alphanumeric display only on Cayman.
sh64: Add defconfigs for mach-sim and mach-harp.
sh64: update cayman defconfig.
sh64: Tidy up Kconfig dependencies.
sh64: Move consistent DMA routines to arch/sh64/mm/.
sh64: Some symbol exports and build fixes.
sh64: mach-sim: Build fixes.
sh64: mach-harp: Build fixes.
sh64: Kill off duplicate frame pointer option.
sh64: Kill off dead ROM-RAM and generic boards.
sh64: Tidy up includes for Cayman board.
sh64: Move *_p() I/O routine variants to io.h.
Diffstat (limited to 'arch/sh64/mm/Makefile')
| -rw-r--r-- | arch/sh64/mm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh64/mm/Makefile b/arch/sh64/mm/Makefile index ff19378ac90..d0e81363248 100644 --- a/arch/sh64/mm/Makefile +++ b/arch/sh64/mm/Makefile @@ -13,7 +13,8 @@ # unless it's something special (ie not a .c file). # -obj-y := init.o fault.o ioremap.o extable.o cache.o tlbmiss.o tlb.o +obj-y := cache.o consistent.o extable.o fault.o init.o ioremap.o \ + tlbmiss.o tlb.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o @@ -41,4 +42,3 @@ CFLAGS_tlbmiss.o += -ffixed-r7 \ -ffixed-r41 -ffixed-r42 -ffixed-r43 \ -ffixed-r60 -ffixed-r61 -ffixed-r62 \ -fomit-frame-pointer - |