diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 22:03:31 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 22:03:31 -0200 |
| commit | e27fc7e476077c724f313a3ddec44ad26c49f678 (patch) | |
| tree | 5d66d9694e4aa3985464e5034f1d4908ec426766 /arch/sparc/mm/Makefile | |
| parent | b6844523839779030430ff28f036f83e2a3f43e6 (diff) | |
| parent | 0b64120cceb86e93cb1bda0dc055f13016646907 (diff) | |
| download | talos-op-linux-e27fc7e476077c724f313a3ddec44ad26c49f678.tar.gz talos-op-linux-e27fc7e476077c724f313a3ddec44ad26c49f678.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Patch sun4v code sequences properly on module load.
sparc: Kill custom io_remap_pfn_range().
sparc: Stash orig_i0 into %g6 instead of %g2
sparc: Fix handling of orig_i0 wrt. debugging when restarting syscalls.
sparc: sigutil: Include <linux/errno.h>
Diffstat (limited to 'arch/sparc/mm/Makefile')
| -rw-r--r-- | arch/sparc/mm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile index e3cda21b5ee9..301421c11291 100644 --- a/arch/sparc/mm/Makefile +++ b/arch/sparc/mm/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o obj-y += fault_$(BITS).o obj-y += init_$(BITS).o obj-$(CONFIG_SPARC32) += loadmmu.o -obj-y += generic_$(BITS).o obj-$(CONFIG_SPARC32) += extable.o btfixup.o srmmu.o iommu.o io-unit.o obj-$(CONFIG_SPARC32) += hypersparc.o viking.o tsunami.o swift.o obj-$(CONFIG_SPARC_LEON)+= leon_mm.o |
