diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 10:03:18 (GMT) |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 10:03:18 (GMT) |
commit | d267b8d6c65ed7636a412ca479b96df7c0f5b27b (patch) | |
tree | f613d83fab377bf3599eb9ffc3cdf34df0a6e48e /arch/m68k/mac | |
parent | 42baa2581c92f8d07e7260506c8d41caf14b0fc3 (diff) | |
parent | 1eab0e42450c6038e2bb17da438370fe639973f3 (diff) | |
download | linux-d267b8d6c65ed7636a412ca479b96df7c0f5b27b.tar.xz |
Merge branch 'linus' into x86/apic
Pull in update changes so we can apply conflicting patches
Diffstat (limited to 'arch/m68k/mac')
-rw-r--r-- | arch/m68k/mac/psc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index cd38f29..2290c0c 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c @@ -29,6 +29,7 @@ int psc_present; volatile __u8 *psc; +EXPORT_SYMBOL_GPL(psc); /* * Debugging dump, used in various places to see what's going on. |