diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 01:51:22 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 01:51:22 (GMT) |
commit | a45d572841a24db02a62cf05e1157c35fdd3705b (patch) | |
tree | 35a25d5843e0dc29abd64b5d9f0cfc1b1d1acd17 /arch/m68k/68000/Makefile | |
parent | fc2414b4b4569fab5404c6f49f36bae0dfa3d936 (diff) | |
parent | e803d4bd31184b301a54352bb2c1a3fa93f80154 (diff) | |
download | linux-a45d572841a24db02a62cf05e1157c35fdd3705b.tar.xz |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer:
"The major change is to remove the arch/m68k/platform directory. The
coldfire (and other non-mmu m68k platform) code is moved to the
arch/m68k level, making them consistent with the traditional m68k
platforms.
A couple of other minor miscellaneous fixes as well"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: Fix typo 'COFNIG_MBAR'
m68knommu: add missing ioport_map() and ioport_unmap()
m68k/coldfire: remove second asm/mcfclk.h inclusion in m54xx.c
m68knommu: fix size of address field for 5272 interrupt controller
m68k: fix crufty 68000 and 68360 intro comments
m68k: remove the unused arch/m68k/platform directory
m68k: move non-mmu 68360 platform code
m68k: move non-mmu 68000 platform code
m68k: fix crufty ColdFire intro comments
m68k: move coldfire platform code
Diffstat (limited to 'arch/m68k/68000/Makefile')
-rw-r--r-- | arch/m68k/68000/Makefile | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/m68k/68000/Makefile b/arch/m68k/68000/Makefile new file mode 100644 index 0000000..1eab70c --- /dev/null +++ b/arch/m68k/68000/Makefile @@ -0,0 +1,18 @@ +################################################## +# +# Makefile for 68000 core based cpus +# +# 2012.10.21, Luis Alves <ljalvs@gmail.com> +# Merged all 68000 based cpu's config +# files into a single directory. +# + +# 68328, 68EZ328, 68VZ328 + +obj-y += entry.o ints.o timers.o +obj-$(CONFIG_M68328) += m68328.o +obj-$(CONFIG_M68EZ328) += m68EZ328.o +obj-$(CONFIG_M68VZ328) += m68VZ328.o +obj-$(CONFIG_ROM) += romvec.o + +extra-y := head.o |