diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:07:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-03 15:07:10 -0700 |
| commit | 34bac238cc13cdb57f3b353b6e5ed3eae2cff158 (patch) | |
| tree | 3fff52deec8671a5599bde9e711f166a7c92d693 /arch/sh/mm/Makefile | |
| parent | 247284481ca40288bd120cf0707681c3bdbee78f (diff) | |
| parent | cc6f33db30c4fcf7915270619e81a91d6190b6c8 (diff) | |
| download | kernel_goldelico_gta04-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.zip kernel_goldelico_gta04-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.tar.gz kernel_goldelico_gta04-34bac238cc13cdb57f3b353b6e5ed3eae2cff158.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
sh: fix defconfigs for sh7751r boards
sh: fix cf support on r2d boards
sh: update r2d defconfig
sh: update snapgear defconfig.
sh: Fix SH-X3 FPU exception handling.
sh: Fix pgd mismatch from cached TTB in unhandled fault.
sh: Don't include fault-nommu on SH-2/SH-2A.
sh: Fix irqflags tracing for SH-3/4 nommu.
sh: Fix lockdep debugging oops on SH-3/4.
Diffstat (limited to 'arch/sh/mm/Makefile')
| -rw-r--r-- | arch/sh/mm/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile index d677d7f..4061e89 100644 --- a/arch/sh/mm/Makefile +++ b/arch/sh/mm/Makefile @@ -8,7 +8,9 @@ obj-$(CONFIG_CPU_SH2) += cache-sh2.o obj-$(CONFIG_CPU_SH3) += cache-sh3.o obj-$(CONFIG_CPU_SH4) += cache-sh4.o -mmu-y := fault-nommu.o tlb-nommu.o pg-nommu.o +mmu-y := tlb-nommu.o pg-nommu.o +mmu-$(CONFIG_CPU_SH3) += fault-nommu.o +mmu-$(CONFIG_CPU_SH4) += fault-nommu.o mmu-$(CONFIG_MMU) := fault.o clear_page.o copy_page.o tlb-flush.o \ ioremap.o |