diff --git a/[refs] b/[refs]
index 4d74a2148efe..df6cf0b11454 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60b7bf4e61dd45e2fe06bd16ba04984405b564f1
+refs/heads/master: e765acb4673f377c53505c01279c040906bd706e
diff --git a/trunk/drivers/nubus/proc.c b/trunk/drivers/nubus/proc.c
index b8286ed65919..5371b374f1fe 100644
--- a/trunk/drivers/nubus/proc.c
+++ b/trunk/drivers/nubus/proc.c
@@ -147,21 +147,6 @@ int nubus_proc_attach_device(struct nubus_dev *dev)
 }
 EXPORT_SYMBOL(nubus_proc_attach_device);
 
-/* FIXME: this is certainly broken! */
-int nubus_proc_detach_device(struct nubus_dev *dev)
-{
-	struct proc_dir_entry *e;
-
-	if ((e = dev->procdir)) {
-		if (atomic_read(&e->count))
-			return -EBUSY;
-		remove_proc_entry(e->name, proc_bus_nubus_dir);
-		dev->procdir = NULL;
-	}
-	return 0;
-}
-EXPORT_SYMBOL(nubus_proc_detach_device);
-
 /*
  * /proc/nubus stuff
  */
diff --git a/trunk/include/linux/nubus.h b/trunk/include/linux/nubus.h
index b3740527571a..6165b2c62040 100644
--- a/trunk/include/linux/nubus.h
+++ b/trunk/include/linux/nubus.h
@@ -87,7 +87,6 @@ static inline void nubus_proc_init(void) {}
 #endif
 int get_nubus_list(char *buf);
 int nubus_proc_attach_device(struct nubus_dev *dev);
-int nubus_proc_detach_device(struct nubus_dev *dev);
 /* If we need more precision we can add some more of these */
 struct nubus_dev* nubus_find_device(unsigned short category,
 				    unsigned short type,