diff options
| author | Linus Torvalds | 2008-04-28 18:45:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-28 18:45:57 +0200 |
| commit | e945e849e18006c131fe59252ab920c6b5f7959c (patch) | |
| tree | a86b1a299c5cebed14889fb638cb6808417b5f4a /drivers/video/p9100.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | sparc: video drivers: add facility level (diff) | |
| download | kernel-qcow2-linux-e945e849e18006c131fe59252ab920c6b5f7959c.tar.gz kernel-qcow2-linux-e945e849e18006c131fe59252ab920c6b5f7959c.tar.xz kernel-qcow2-linux-e945e849e18006c131fe59252ab920c6b5f7959c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: video drivers: add facility level
sparc: tcx.c make tcx_init and tcx_exit static
sparc: ffb.c make ffb_init and ffb_exit static
sparc: cg14.c make cg14_init and cg15_exit static
sparc: bw2.c fix bw2_exit
sparc64: Fix accidental syscall restart on child return from clone/fork/vfork.
sparc64: Clean up handling of pt_regs trap type encoding.
sparc: Remove old style signal frame support.
sparc64: Kill bogus RT_ALIGNEDSZ macro from signal.c
sparc: sunzilog.c remove unused argument
sparc: fix drivers/video/tcx.c warning
sparc64: Kill unused local ISA bus layer.
input: Rewrite sparcspkr device probing.
sparc64: Do not ignore 'pmu' device ranges.
sparc64: Kill ISA_FLOPPY_WORKS code.
sparc64: Kill CONFIG_SPARC32_COMPAT
sparc64: Cleanups and corrections for arch/sparc64/Kconfig
sparc64: Fix wedged irq regression.
Diffstat (limited to 'drivers/video/p9100.c')
| -rw-r--r-- | drivers/video/p9100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 58496061142d..c95874fe9076 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c @@ -310,7 +310,7 @@ static int __devinit p9100_probe(struct of_device *op, const struct of_device_id dev_set_drvdata(&op->dev, info); - printk("%s: p9100 at %lx:%lx\n", + printk(KERN_INFO "%s: p9100 at %lx:%lx\n", dp->full_name, par->which_io, par->physbase); |