diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 18:36:35 +0100 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/input/serio/hp_sdc_mlc.c | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/input/serio/hp_sdc_mlc.c')
-rw-r--r-- | drivers/input/serio/hp_sdc_mlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c index 820e51673b2..7d2b820ef58 100644 --- a/drivers/input/serio/hp_sdc_mlc.c +++ b/drivers/input/serio/hp_sdc_mlc.c @@ -125,7 +125,7 @@ static void hp_sdc_mlc_isr (int irq, void *dev_id, break; default: - printk(KERN_WARNING PREFIX "Unkown HIL Error status (%x)!\n", data); + printk(KERN_WARNING PREFIX "Unknown HIL Error status (%x)!\n", data); break; } |