Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer: "It contains a few small fixes for the non-MMU m68k platforms. Fixes some compilation problems, some broken header definitions, removes an unused config option and adds a name for the old 68000 CPU support." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: drop "select EMAC_INC" m68knommu: fix misnamed GPIO pin definition for ColdFire 528x CPU m68knommu: fix MC68328.h defines m68knommu: fix build when CPU is not coldfire m68knommu: add CPU_NAME for 68000
Showing
- arch/m68k/Kconfig.machine 0 additions, 1 deletionarch/m68k/Kconfig.machine
- arch/m68k/include/asm/MC68328.h 5 additions, 5 deletionsarch/m68k/include/asm/MC68328.h
- arch/m68k/kernel/setup_no.c 3 additions, 0 deletionsarch/m68k/kernel/setup_no.c
- arch/m68k/mm/init.c 1 addition, 1 deletionarch/m68k/mm/init.c
- arch/m68k/platform/coldfire/m528x.c 1 addition, 1 deletionarch/m68k/platform/coldfire/m528x.c
Loading
Please register or sign in to comment