Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[safe/jmp/linux-2.6] / scripts / mod / file2alias.c

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e7b5350..84e2120 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -245,7 +245,7 @@ static int do_ccw_entry(const char *filename,
            id->cu_model);
        ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
            id->dev_type);
-       ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
+       ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
            id->dev_model);
        return 1;
 }