Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / include / linux / nubus.h

diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index b374052..6165b2c 100644 (file)
--- a/include/linux/nubus.h
+++ b/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,