diff --git a/[refs] b/[refs]
index 9dcfa3eca66f..2252276aa4ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 995fc4df0bc8d88417742e4b1d17889fc64b6ef3
+refs/heads/master: 1259f2b3657e21f18a7f31f9b1c027e304838b18
diff --git a/trunk/drivers/input/misc/pcspkr.c b/trunk/drivers/input/misc/pcspkr.c
index e34633c37fdd..68ac97f101b0 100644
--- a/trunk/drivers/input/misc/pcspkr.c
+++ b/trunk/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;