diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 09:04:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-09 09:04:46 -0700 |
| commit | 833ae40b517a99e05fc4aea399e71f633f3348d2 (patch) | |
| tree | 827e720027fd4349e303f065ae58859184d11935 /arch/m68k/platform/68000/m68EZ328.c | |
| parent | 20e029d791b22000c45ac7ce5a09e8dee8a3d323 (diff) | |
| parent | c065edde73508c6da4afaf064e5999eb3e5aead1 (diff) | |
| download | op-kernel-dev-833ae40b517a99e05fc4aea399e71f633f3348d2.zip op-kernel-dev-833ae40b517a99e05fc4aea399e71f633f3348d2.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fixes from Greg Ungerer:
"Just a small collection of cleanups and fixes this time, no big
changes. The most interresting are to make the m68k and m68knommu
consistently use CONFIG_IOMAP, clean out some unused board config
options and flush the cache on signal stack creation"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: remove 16 unused boards in Kconfig.machine
m68k: define 'VM_DATA_DEFAULT_FLAGS' no matter whether has 'NOMMU' or not
m68knommu: user generic iomap to support ioread*/iowrite*
m68k/coldfire: flush cache when creating the signal stack frame
m68knommu: Mark functions only called from setup_arch() __init
Diffstat (limited to 'arch/m68k/platform/68000/m68EZ328.c')
| -rw-r--r-- | arch/m68k/platform/68000/m68EZ328.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/platform/68000/m68EZ328.c index a6eb72d..332b5e8 100644 --- a/arch/m68k/platform/68000/m68EZ328.c +++ b/arch/m68k/platform/68000/m68EZ328.c @@ -13,6 +13,7 @@ /***************************************************************************/ +#include <linux/init.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/rtc.h> @@ -52,7 +53,7 @@ _bsc1(unsigned char *, gethwaddr, int, a) _bsc1(char *, getbenv, char *, a) #endif -void config_BSP(char *command, int len) +void __init config_BSP(char *command, int len) { unsigned char *p; |
