diff options
| author |   Tom Gundersen <teg@jklm.no> | 2014-02-03 11:14:13 +1030 |
|---|---|---|
| committer |   Rusty Russell <rusty@rustcorp.com.au> | 2014-03-13 12:11:00 +1030 |
| commit | 21bdd17b21b45ea48e06e23918d681afbe0622e9 (patch) | |
| tree | 6eff7072912ade3ba7722d98acc753c65477b169 /include/linux/module.h | |
| parent | module: use pr_cont (diff) | |
| download | linux-dev-21bdd17b21b45ea48e06e23918d681afbe0622e9.tar.xz linux-dev-21bdd17b21b45ea48e06e23918d681afbe0622e9.zip | |
module: allow multiple calls to MODULE_DEVICE_TABLE() per module
Commit 78551277e4df5: "Input: i8042 - add PNP modaliases" had a bug, where the
second call to MODULE_DEVICE_TABLE() overrode the first resulting in not all
the modaliases being exposed.
This fixes the problem by including the name of the device_id table in the
__mod_*_device_table alias, allowing us to export several device_id tables
per module.
Suggested-by: Kay Sievers <kay@vrfy.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Tom Gundersen <teg@jklm.no>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index eaf60ff9ba94..ad18f6006f86 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -142,7 +142,7 @@ extern const struct gtype##_id __mod_##gtype##_table \ #define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) #define MODULE_DEVICE_TABLE(type, name) \ - MODULE_GENERIC_TABLE(type##_device, name) + MODULE_GENERIC_TABLE(type##__##name##_device, name) /* Version of form [<epoch>:]<version>[-<extra-version>]. * Or for CVS/RCS ID version, everything but the number is stripped. |