Merge master.kernel.org:/home/rmk/linux-2.6-serial

[pandora-kernel.git] / drivers / input / misc / pcspkr.c

diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index e34633c..68ac97f 100644 (file)
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -71,7 +71,7 @@ static int __init pcspkr_init(void)
                return -ENOMEM;
 
        pcspkr_dev->name = "PC Speaker";
-       pcspkr_dev->name = "isa0061/input0";
+       pcspkr_dev->phys = "isa0061/input0";
        pcspkr_dev->id.bustype = BUS_ISA;
        pcspkr_dev->id.vendor = 0x001f;
        pcspkr_dev->id.product = 0x0001;