Automatic merge of /spare/repo/netdev-2.6 branch starfire

[linux-2.6] / fs / char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index 7357a9127df1551066f4b07554e2ccddd598633e..c1e3537909fc1ae78f829220700810b78f371480 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -26,8 +26,7 @@
 
 static struct kobj_map *cdev_map;
 
-/* degrade to linked list for small systems */
-#define MAX_PROBE_HASH (CONFIG_BASE_SMALL ? 1 : 255)
+#define MAX_PROBE_HASH 255     /* random */
 
 static DECLARE_MUTEX(chrdevs_lock);
 
@@ -329,7 +328,7 @@ void cd_forget(struct inode *inode)
        spin_unlock(&cdev_lock);
 }
 
-void cdev_purge(struct cdev *cdev)
+static void cdev_purge(struct cdev *cdev)
 {
        spin_lock(&cdev_lock);
        while (!list_empty(&cdev->list)) {