Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Browse source

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

...

This commit is contained in:

Linus Torvalds 2013-03-12 10:20:15 -07:00

parent fa4a6732a8 ef9240f482

commit 4388817f70

5 changed files with 10 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/m68k/Kconfig.machine

View file

10

arch/m68k/include/asm/MC68328.h

View file

3

arch/m68k/kernel/setup_no.c

View file

2

arch/m68k/mm/init.c

View file

2

arch/m68k/platform/coldfire/m528x.c

View file