aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-04 13:24:20 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-05 01:14:43 -0500
commit9961e25976493f4d50704dafc0e8ff8365181538 (patch)
tree7e1e4e318d4070428b4baaa94711e951078f4f80 /drivers/input
parentc45fc81ec6a9bd6cca42e60b35b31f9df822860b (diff)
Input: psmouse - remove identification strings from DMI tables
The driver does not reference identification strings in DMI tables and since these strings are no longer required by DMI core we can safely remove them and save some memory. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/lifebook.c22
-rw-r--r--drivers/input/mouse/synaptics.c8
2 files changed, 15 insertions, 15 deletions
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index cd81cefdc1c..2e6bdfea016 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -46,50 +46,50 @@ static int lifebook_set_6byte_proto(const struct dmi_system_id *d)
46static const struct dmi_system_id __initconst lifebook_dmi_table[] = { 46static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
47#if defined(CONFIG_DMI) && defined(CONFIG_X86) 47#if defined(CONFIG_DMI) && defined(CONFIG_X86)
48 { 48 {
49 .ident = "FLORA-ie 55mi", 49 /* FLORA-ie 55mi */
50 .matches = { 50 .matches = {
51 DMI_MATCH(DMI_PRODUCT_NAME, "FLORA-ie 55mi"), 51 DMI_MATCH(DMI_PRODUCT_NAME, "FLORA-ie 55mi"),
52 }, 52 },
53 }, 53 },
54 { 54 {
55 .ident = "LifeBook B", 55 /* LifeBook B */
56 .matches = { 56 .matches = {
57 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B Series"), 57 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B Series"),
58 }, 58 },
59 }, 59 },
60 { 60 {
61 .ident = "Lifebook B", 61 /* Lifebook B */
62 .matches = { 62 .matches = {
63 DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"), 63 DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK B Series"),
64 }, 64 },
65 }, 65 },
66 { 66 {
67 .ident = "Lifebook B-2130", 67 /* Lifebook B-2130 */
68 .matches = { 68 .matches = {
69 DMI_MATCH(DMI_BOARD_NAME, "ZEPHYR"), 69 DMI_MATCH(DMI_BOARD_NAME, "ZEPHYR"),
70 }, 70 },
71 }, 71 },
72 { 72 {
73 .ident = "Lifebook B213x/B2150", 73 /* Lifebook B213x/B2150 */
74 .matches = { 74 .matches = {
75 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"), 75 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B2131/B2133/B2150"),
76 }, 76 },
77 }, 77 },
78 { 78 {
79 .ident = "Zephyr", 79 /* Zephyr */
80 .matches = { 80 .matches = {
81 DMI_MATCH(DMI_PRODUCT_NAME, "ZEPHYR"), 81 DMI_MATCH(DMI_PRODUCT_NAME, "ZEPHYR"),
82 }, 82 },
83 }, 83 },
84 { 84 {
85 .ident = "CF-18", 85 /* Panasonic CF-18 */
86 .matches = { 86 .matches = {
87 DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"), 87 DMI_MATCH(DMI_PRODUCT_NAME, "CF-18"),
88 }, 88 },
89 .callback = lifebook_limit_serio3, 89 .callback = lifebook_limit_serio3,
90 }, 90 },
91 { 91 {
92 .ident = "Panasonic CF-28", 92 /* Panasonic CF-28 */
93 .matches = { 93 .matches = {
94 DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"), 94 DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
95 DMI_MATCH(DMI_PRODUCT_NAME, "CF-28"), 95 DMI_MATCH(DMI_PRODUCT_NAME, "CF-28"),
@@ -97,7 +97,7 @@ static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
97 .callback = lifebook_set_6byte_proto, 97 .callback = lifebook_set_6byte_proto,
98 }, 98 },
99 { 99 {
100 .ident = "Panasonic CF-29", 100 /* Panasonic CF-29 */
101 .matches = { 101 .matches = {
102 DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"), 102 DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"),
103 DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"), 103 DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"),
@@ -105,14 +105,14 @@ static const struct dmi_system_id __initconst lifebook_dmi_table[] = {
105 .callback = lifebook_set_6byte_proto, 105 .callback = lifebook_set_6byte_proto,
106 }, 106 },
107 { 107 {
108 .ident = "CF-72", 108 /* Panasonic CF-72 */
109 .matches = { 109 .matches = {
110 DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"), 110 DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),
111 }, 111 },
112 .callback = lifebook_set_6byte_proto, 112 .callback = lifebook_set_6byte_proto,
113 }, 113 },
114 { 114 {
115 .ident = "Lifebook B142", 115 /* Lifebook B142 */
116 .matches = { 116 .matches = {
117 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 117 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
118 }, 118 },
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 36d6df4c0a7..05689e73219 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -635,21 +635,21 @@ static bool impaired_toshiba_kbc;
635static const struct dmi_system_id __initconst toshiba_dmi_table[] = { 635static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
636#if defined(CONFIG_DMI) && defined(CONFIG_X86) 636#if defined(CONFIG_DMI) && defined(CONFIG_X86)
637 { 637 {
638 .ident = "Toshiba Satellite", 638 /* Toshiba Satellite */
639 .matches = { 639 .matches = {
640 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), 640 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
641 DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"), 641 DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
642 }, 642 },
643 }, 643 },
644 { 644 {
645 .ident = "Toshiba Dynabook", 645 /* Toshiba Dynabook */
646 .matches = { 646 .matches = {
647 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), 647 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
648 DMI_MATCH(DMI_PRODUCT_NAME, "dynabook"), 648 DMI_MATCH(DMI_PRODUCT_NAME, "dynabook"),
649 }, 649 },
650 }, 650 },
651 { 651 {
652 .ident = "Toshiba Portege M300", 652 /* Toshiba Portege M300 */
653 .matches = { 653 .matches = {
654 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), 654 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
655 DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"), 655 DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
@@ -657,7 +657,7 @@ static const struct dmi_system_id __initconst toshiba_dmi_table[] = {
657 657
658 }, 658 },
659 { 659 {
660 .ident = "Toshiba Portege M300", 660 /* Toshiba Portege M300 */
661 .matches = { 661 .matches = {
662 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), 662 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
663 DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"), 663 DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),