diff --git a/[refs] b/[refs]
index 55d0436e6d4a..f8573f000a0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a891a24e4d0056c365a90ff2d71c38fd366b0d0
+refs/heads/master: 06aa05b307e8efbc278f201198e7cdf3877bc5c2
diff --git a/trunk/arch/x86/kernel/uv_sysfs.c b/trunk/arch/x86/kernel/uv_sysfs.c
index 67f9b9dbf800..36afb98675a4 100644
--- a/trunk/arch/x86/kernel/uv_sysfs.c
+++ b/trunk/arch/x86/kernel/uv_sysfs.c
@@ -21,6 +21,7 @@
 
 #include <linux/sysdev.h>
 #include <asm/uv/bios.h>
+#include <asm/uv/uv.h>
 
 struct kobject *sgi_uv_kobj;
 
@@ -47,6 +48,9 @@ static int __init sgi_uv_sysfs_init(void)
 {
 	unsigned long ret;
 
+	if (!is_uv_system())
+		return -ENODEV;
+
 	if (!sgi_uv_kobj)
 		sgi_uv_kobj = kobject_create_and_add("sgi_uv", firmware_kobj);
 	if (!sgi_uv_kobj) {