diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:10:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:10:24 -0800 |
| commit | 9e09d05cfe7df9efa7bbca7d679af534a616026e (patch) | |
| tree | ae9501674896ae1bc19a78ad4c97fbfc666e4bcb /arch/m68k/mac/baboon.c | |
| parent | d60a540ac5f2fbab3e6fe592717b445bd7343a91 (diff) | |
| parent | 5e387199c17c4d2fb8b72ada82fbf81f4ba6f317 (diff) | |
| download | linux-stable-9e09d05cfe7df9efa7bbca7d679af534a616026e.tar.gz linux-stable-9e09d05cfe7df9efa7bbca7d679af534a616026e.tar.bz2 linux-stable-9e09d05cfe7df9efa7bbca7d679af534a616026e.zip | |
Merge tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- more printk modernization
- various cleanups and fixes (incl. a race condition) for Mac
- defconfig updates
* tag 'm68k-for-v4.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/defconfig: Update defconfigs for v4.14-rc7
m68k/mac: Add mutual exclusion for IOP interrupt polling
m68k/mac: Disentangle VIA/RBV and NuBus initialization
m68k/mac: Disentangle VIA and OSS initialization
m68k/mac: More printk modernization
Diffstat (limited to 'arch/m68k/mac/baboon.c')
| -rw-r--r-- | arch/m68k/mac/baboon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c index 850f0dc284ca..c7ea6475ef9b 100644 --- a/arch/m68k/mac/baboon.c +++ b/arch/m68k/mac/baboon.c @@ -37,7 +37,7 @@ void __init baboon_init(void) baboon = (struct baboon *) BABOON_BASE; baboon_present = 1; - printk("Baboon detected at %p\n", baboon); + pr_debug("Baboon detected at %p\n", baboon); } /* |