diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-05-19 09:23:07 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-19 09:23:07 +0200 |
commit | a8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c (patch) | |
tree | fa3c8e81ffa64798e85425cf139fdd6ba3fd7963 /drivers/input/serio | |
parent | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (diff) | |
parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) |
Merge branch 'linus' into x86/pattip-x86-pat-2008-05-19-07-23-07
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/hp_sdc_mlc.c | 5 | ||||
-rw-r--r-- | drivers/input/serio/q40kbd.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c index f1fd3b638a37..587398f5c9df 100644 --- a/drivers/input/serio/hp_sdc_mlc.c +++ b/drivers/input/serio/hp_sdc_mlc.c @@ -306,6 +306,11 @@ static int __init hp_sdc_mlc_init(void) { hil_mlc *mlc = &hp_sdc_mlc; +#ifdef __mc68000__ + if (!MACH_IS_HP300) + return -ENODEV; +#endif + printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n"); hp_sdc_mlc_priv.emtestmode = 0; diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index cb89aff2e160..d962a8d78b14 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c @@ -156,7 +156,7 @@ static int __init q40kbd_init(void) int error; if (!MACH_IS_Q40) - return -EIO; + return -ENODEV; error = platform_driver_register(&q40kbd_driver); if (error) |