diff --git a/[refs] b/[refs]
index 522234615d66..896db05bf618 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7243cc05bafdda4c4de77cba00cf87666bd237f7
+refs/heads/master: 609725f87709724218047a1049913ed233f79d3c
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index de0379b6d502..c055bb630ffc 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -273,7 +273,6 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma)
 
 	vma->vm_flags |= VM_IO;
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-	addr = __pa(addr);
 
 	if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,
 					PAGE_SIZE, vma->vm_page_prot)) {