diff options
author | Linus Torvalds | 2006-01-10 17:21:33 +0100 |
---|---|---|
committer | Linus Torvalds | 2006-01-10 17:21:33 +0100 |
commit | ab396e91bfe953db26fa1083d9c3e7a4fbe0334a (patch) | |
tree | 81db9e5f919b84dcb4284ca8cdf675e13716c191 /scripts/mod | |
parent | [PATCH] fs/hfsplus/: remove the hfsplus_inode_check() debug function (diff) | |
parent | kbuild: re-export VERSION, PATCHLEVEL, SUBLEVEL (diff) | |
download | kernel-qcow2-linux-ab396e91bfe953db26fa1083d9c3e7a4fbe0334a.tar.gz kernel-qcow2-linux-ab396e91bfe953db26fa1083d9c3e7a4fbe0334a.tar.xz kernel-qcow2-linux-ab396e91bfe953db26fa1083d9c3e7a4fbe0334a.zip |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile
Diffstat (limited to 'scripts/mod')
-rw-r--r-- | scripts/mod/file2alias.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index e0eedffe565b..be97caf664bb 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -417,7 +417,7 @@ static int do_input_entry(const char *filename, struct input_device_id *id, do_input(alias, id->sndbit, 0, SND_MAX); sprintf(alias + strlen(alias), "f*"); if (id->flags&INPUT_DEVICE_ID_MATCH_FFBIT) - do_input(alias, id->ffbit, 0, SND_MAX); + do_input(alias, id->ffbit, 0, FF_MAX); sprintf(alias + strlen(alias), "w*"); if (id->flags&INPUT_DEVICE_ID_MATCH_SWBIT) do_input(alias, id->swbit, 0, SW_MAX); |