summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-10-31 00:33:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 10:57:18 -0800
commitd84c1fcb5bdb1ac919fe7262505306a2ca1a6281 (patch)
treebf3fd7dcd9bb735f4c8cf672e76526839deeac4a /drivers
parent5b1c45c29961824f123ae8ed1020db2bd8d072ba (diff)
downloadlinux-3.10-d84c1fcb5bdb1ac919fe7262505306a2ca1a6281.tar.gz
linux-3.10-d84c1fcb5bdb1ac919fe7262505306a2ca1a6281.tar.bz2
linux-3.10-d84c1fcb5bdb1ac919fe7262505306a2ca1a6281.zip
Input: i8042 - add PNP modaliases
commit 78551277e4df57864b0b0e7f85c23ede2be2edb8 upstream. This allows the module to be autoloaded in the common case. In order to work on non-PnP systems the module should be compiled in or loaded unconditionally at boot (c.f. modules-load.d(5)), as before. Signed-off-by: Tom Gundersen <teg@jklm.no> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/serio/i8042-x86ia64io.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 5f306f79da0..0ec9abbe31f 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -765,6 +765,7 @@ static struct pnp_device_id pnp_kbd_devids[] = {
{ .id = "CPQA0D7", .driver_data = 0 },
{ .id = "", },
};
+MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
static struct pnp_driver i8042_pnp_kbd_driver = {
.name = "i8042 kbd",
@@ -786,6 +787,7 @@ static struct pnp_device_id pnp_aux_devids[] = {
{ .id = "SYN0801", .driver_data = 0 },
{ .id = "", },
};
+MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);
static struct pnp_driver i8042_pnp_aux_driver = {
.name = "i8042 aux",