summaryrefslogtreecommitdiffstats
path: root/drivers/video/console
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 18:36:35 +0100
committerJiri Kosina <jkosina@suse.cz>2009-12-07 18:36:35 +0100
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/video/console
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
downloadop-kernel-dev-d014d043869cdc591f3a33243d3481fa4479c2d0.zip
op-kernel-dev-d014d043869cdc591f3a33243d3481fa4479c2d0.tar.gz
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/sticore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 857b366..6468a29 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -436,7 +436,7 @@ sti_init_glob_cfg(struct sti_struct *sti,
(offs < PCI_BASE_ADDRESS_0 ||
offs > PCI_BASE_ADDRESS_5)) {
printk (KERN_WARNING
- "STI pci region maping for region %d (%02x) can't be mapped\n",
+ "STI pci region mapping for region %d (%02x) can't be mapped\n",
i,sti->rm_entry[i]);
continue;
}
OpenPOWER on IntegriCloud