aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/nubus/proc.c15
-rw-r--r--include/linux/nubus.h1
2 files changed, 0 insertions, 16 deletions
diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c
index b8286ed65919..5371b374f1fe 100644
--- a/drivers/nubus/proc.c
+++ b/drivers/nubus/proc.c
@@ -147,21 +147,6 @@ int nubus_proc_attach_device(struct nubus_dev *dev)
147} 147}
148EXPORT_SYMBOL(nubus_proc_attach_device); 148EXPORT_SYMBOL(nubus_proc_attach_device);
149 149
150/* FIXME: this is certainly broken! */
151int nubus_proc_detach_device(struct nubus_dev *dev)
152{
153 struct proc_dir_entry *e;
154
155 if ((e = dev->procdir)) {
156 if (atomic_read(&e->count))
157 return -EBUSY;
158 remove_proc_entry(e->name, proc_bus_nubus_dir);
159 dev->procdir = NULL;
160 }
161 return 0;
162}
163EXPORT_SYMBOL(nubus_proc_detach_device);
164
165/* 150/*
166 * /proc/nubus stuff 151 * /proc/nubus stuff
167 */ 152 */
diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index b3740527571a..6165b2c62040 100644
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -87,7 +87,6 @@ static inline void nubus_proc_init(void) {}
87#endif 87#endif
88int get_nubus_list(char *buf); 88int get_nubus_list(char *buf);
89int nubus_proc_attach_device(struct nubus_dev *dev); 89int nubus_proc_attach_device(struct nubus_dev *dev);
90int nubus_proc_detach_device(struct nubus_dev *dev);
91/* If we need more precision we can add some more of these */ 90/* If we need more precision we can add some more of these */
92struct nubus_dev* nubus_find_device(unsigned short category, 91struct nubus_dev* nubus_find_device(unsigned short category,
93 unsigned short type, 92 unsigned short type,