Merge tag 'kbuild-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[linux-2.6-microblaze.git] / scripts / mod / file2alias.c

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 6583b36..4829680 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1458,6 +1458,10 @@ static int do_cdx_entry(const char *filename, void *symval,
 {
        DEF_FIELD(symval, cdx_device_id, vendor);
        DEF_FIELD(symval, cdx_device_id, device);
+       DEF_FIELD(symval, cdx_device_id, subvendor);
+       DEF_FIELD(symval, cdx_device_id, subdevice);
+       DEF_FIELD(symval, cdx_device_id, class);
+       DEF_FIELD(symval, cdx_device_id, class_mask);
        DEF_FIELD(symval, cdx_device_id, override_only);
 
        switch (override_only) {
@@ -1475,6 +1479,18 @@ static int do_cdx_entry(const char *filename, void *symval,
 
        ADD(alias, "v", vendor != CDX_ANY_ID, vendor);
        ADD(alias, "d", device != CDX_ANY_ID, device);
+       ADD(alias, "sv", subvendor != CDX_ANY_ID, subvendor);
+       ADD(alias, "sd", subdevice != CDX_ANY_ID, subdevice);
+       ADD(alias, "c", class_mask == 0xFFFFFF, class);
+
+       return 1;
+}
+
+static int do_vchiq_entry(const char *filename, void *symval, char *alias)
+{
+       DEF_FIELD_ADDR(symval, vchiq_device_id, name);
+       sprintf(alias, "vchiq:%s", *name);
+
        return 1;
 }
 
@@ -1558,6 +1574,7 @@ static const struct devtable devtable[] = {
        {"dfl", SIZE_dfl_device_id, do_dfl_entry},
        {"ishtp", SIZE_ishtp_device_id, do_ishtp_entry},
        {"cdx", SIZE_cdx_device_id, do_cdx_entry},
+       {"vchiq", SIZE_vchiq_device_id, do_vchiq_entry},
 };
 
 /* Create MODULE_ALIAS() statements.