diff --git a/[refs] b/[refs]
index 660995cb1f32..2e97e90d3d37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0612b1f0b3d851458dafe5886e33d58c1967440
+refs/heads/master: 46d7b522ebf486edbd096965d534cc6465e9e309
diff --git a/trunk/fs/hppfs/Makefile b/trunk/fs/hppfs/Makefile
index 6890433f7595..8a1f50344368 100644
--- a/trunk/fs/hppfs/Makefile
+++ b/trunk/fs/hppfs/Makefile
@@ -1,9 +1,9 @@
 #
-# Copyright (C) 2002, 2003 Jeff Dike (jdike@karaya.com)
+# Copyright (C) 2002 - 2008 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 # Licensed under the GPL
 #
 
-hppfs-objs := hppfs_kern.o
+hppfs-objs := hppfs.o
 
 obj-y =
-obj-$(CONFIG_HPPFS) += hppfs.o
+obj-$(CONFIG_HPPFS) += $(hppfs-objs)
diff --git a/trunk/fs/hppfs/hppfs_kern.c b/trunk/fs/hppfs/hppfs.c
similarity index 100%
rename from trunk/fs/hppfs/hppfs_kern.c
rename to trunk/fs/hppfs/hppfs.c