Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / drivers / input / misc / sparcspkr.c

diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 5778220a18d23945eeb7f3cdb1f054cef1a308bc..29d97b12be7a4bc1753e7279e774b7e007fe7b6f 100644 (file)
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -143,7 +143,7 @@ static int __init init_isa_beep(struct sparc_isa_device *isa_dev)
        sparcspkr_dev->name = "Sparc ISA Speaker";
        sparcspkr_dev->event = isa_spkr_event;
 
-       input_register_device(&sparcspkr_dev);
+       input_register_device(sparcspkr_dev);
 
        return 0;
 }