diff options
| author | Linus Torvalds | 2016-12-12 17:44:23 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2016-12-12 17:44:23 +0100 |
| commit | 0261b5d3a6ed43fa8f801ded6e265d1f3403ad24 (patch) | |
| tree | 867174b8aa40d33b25511bd0d09d3e9c25b6bf4e /arch/m68k/coldfire/Makefile | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc (diff) | |
| parent | m68knommu: AMCORE board, add iMX i2c support (diff) | |
| download | kernel-qcow2-linux-0261b5d3a6ed43fa8f801ded6e265d1f3403ad24.tar.gz kernel-qcow2-linux-0261b5d3a6ed43fa8f801ded6e265d1f3403ad24.tar.xz kernel-qcow2-linux-0261b5d3a6ed43fa8f801ded6e265d1f3403ad24.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
"There are two sets of changes in this pull.
The largest is the addition of the ColdFire platform side i2c support
(the IO addressing, setup and clock definitions). The i2c hardware
module itself is driven by the kernels existing iMX i2c driver.
The other change is the addition of support for the Amcore board"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: AMCORE board, add iMX i2c support
m68k: add Sysam AMCORE open board support
m68knommu: platform support for i2c devices on ColdFire SoC
Diffstat (limited to 'arch/m68k/coldfire/Makefile')
| -rw-r--r-- | arch/m68k/coldfire/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/coldfire/Makefile b/arch/m68k/coldfire/Makefile index 68f0fac60099..4aa2c57afc35 100644 --- a/arch/m68k/coldfire/Makefile +++ b/arch/m68k/coldfire/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_NETtel) += nettel.o obj-$(CONFIG_CLEOPATRA) += nettel.o obj-$(CONFIG_FIREBEE) += firebee.o obj-$(CONFIG_MCF8390) += mcf8390.o +obj-$(CONFIG_AMCORE) += amcore.o obj-$(CONFIG_PCI) += pci.o |