diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 19:07:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-03 19:07:13 +0200 |
| commit | 1e649afde3708012daf43ff91730595e30e6f3bb (patch) | |
| tree | 3b3a9e873621e7729cc64f36465ffa3cf116c11c /arch/m68k/mac/config.c | |
| parent | Merge branch 'drm-prime-dmabuf-initial' of git://people.freedesktop.org/~airl... (diff) | |
| parent | m68k/q40: Add missing platform check before registering platform devices (diff) | |
| download | linux-1e649afde3708012daf43ff91730595e30e6f3bb.tar.xz linux-1e649afde3708012daf43ff91730595e30e6f3bb.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"Here are a few fixes for the m68k architecture. Nothing fancy this
time, just a build fix for the asm/system.h disintegration, and two
fixes for missing platform checks (one got in during last merge
window), which can cause crashes in multi-platform kernels."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/q40: Add missing platform check before registering platform devices
m68k/mac: Add missing platform check before registering platform devices
m68k: include asm/cmpxchg.h in our m68k atomic.h
Diffstat (limited to 'arch/m68k/mac/config.c')
| -rw-r--r-- | arch/m68k/mac/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 96fa6ed7e799..d9f62e0f46c0 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -980,6 +980,9 @@ int __init mac_platform_init(void) { u8 *swim_base; + if (!MACH_IS_MAC) + return -ENODEV; + /* * Serial devices */ |