| commit | a4e884a311893b476893739901bed382cd62b4fe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | Sun Apr 17 14:47:24 2005 -0700 |
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Sun Apr 17 14:47:24 2005 -0700 |
| tree | 7b7b52678b61dfdf8e3a16b0e920d1e9b0cae979 | |
| parent | ce1dc02f76432a46db149241e015a4f782974623 [diff] | |
| parent | cc56449f53ba45646c6f0a2edf77c4acb342caed [diff] |
Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes First ever true git merge. Let's see if it actually works.
diff --git a/fs/char_dev.c b/fs/char_dev.c index 7357a91..a745b1d 100644 --- 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);