diff options
-rw-r--r-- | drivers/input/keyboard/hilkbd.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/gscps2.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/hp_sdc.c | 2 | ||||
-rw-r--r-- | drivers/net/lasi_82596.c | 2 | ||||
-rw-r--r-- | drivers/parisc/asp.c | 2 | ||||
-rw-r--r-- | drivers/parisc/ccio-dma.c | 2 | ||||
-rw-r--r-- | drivers/parisc/dino.c | 4 | ||||
-rw-r--r-- | drivers/parisc/eisa.c | 2 | ||||
-rw-r--r-- | drivers/parisc/hppb.c | 2 | ||||
-rw-r--r-- | drivers/parisc/lasi.c | 2 | ||||
-rw-r--r-- | drivers/scsi/lasi700.c | 2 | ||||
-rw-r--r-- | drivers/serial/mux.c | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c index eecb77db0847..8aa81c9ac2f7 100644 --- a/drivers/input/keyboard/hilkbd.c +++ b/drivers/input/keyboard/hilkbd.c | |||
@@ -299,7 +299,7 @@ static struct parisc_device_id hil_tbl[] = { | |||
299 | MODULE_DEVICE_TABLE(parisc, hil_tbl); | 299 | MODULE_DEVICE_TABLE(parisc, hil_tbl); |
300 | 300 | ||
301 | static struct parisc_driver hil_driver = { | 301 | static struct parisc_driver hil_driver = { |
302 | .name = "HIL", | 302 | .name = "hil", |
303 | .id_table = hil_tbl, | 303 | .id_table = hil_tbl, |
304 | .probe = hil_init_chip, | 304 | .probe = hil_init_chip, |
305 | }; | 305 | }; |
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 897e4c12b642..4bad2810190c 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
@@ -444,7 +444,7 @@ static struct parisc_device_id gscps2_device_tbl[] = { | |||
444 | }; | 444 | }; |
445 | 445 | ||
446 | static struct parisc_driver parisc_ps2_driver = { | 446 | static struct parisc_driver parisc_ps2_driver = { |
447 | .name = "GSC PS2", | 447 | .name = "gsc_ps2", |
448 | .id_table = gscps2_device_tbl, | 448 | .id_table = gscps2_device_tbl, |
449 | .probe = gscps2_probe, | 449 | .probe = gscps2_probe, |
450 | .remove = gscps2_remove, | 450 | .remove = gscps2_remove, |
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 7629452dd64b..045b9a7a9dbb 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c | |||
@@ -764,7 +764,7 @@ MODULE_DEVICE_TABLE(parisc, hp_sdc_tbl); | |||
764 | static int __init hp_sdc_init_hppa(struct parisc_device *d); | 764 | static int __init hp_sdc_init_hppa(struct parisc_device *d); |
765 | 765 | ||
766 | static struct parisc_driver hp_sdc_driver = { | 766 | static struct parisc_driver hp_sdc_driver = { |
767 | .name = "HP SDC", | 767 | .name = "hp_sdc", |
768 | .id_table = hp_sdc_tbl, | 768 | .id_table = hp_sdc_tbl, |
769 | .probe = hp_sdc_init_hppa, | 769 | .probe = hp_sdc_init_hppa, |
770 | }; | 770 | }; |
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index 41bad07ac1ac..180e526a2049 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
@@ -1566,7 +1566,7 @@ static struct parisc_device_id lan_tbl[] = { | |||
1566 | MODULE_DEVICE_TABLE(parisc, lan_tbl); | 1566 | MODULE_DEVICE_TABLE(parisc, lan_tbl); |
1567 | 1567 | ||
1568 | static struct parisc_driver lan_driver = { | 1568 | static struct parisc_driver lan_driver = { |
1569 | .name = "Apricot", | 1569 | .name = "lasi_82596", |
1570 | .id_table = lan_tbl, | 1570 | .id_table = lan_tbl, |
1571 | .probe = lan_init_chip, | 1571 | .probe = lan_init_chip, |
1572 | }; | 1572 | }; |
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c index 388609967133..52f37b424318 100644 --- a/drivers/parisc/asp.c +++ b/drivers/parisc/asp.c | |||
@@ -126,7 +126,7 @@ static struct parisc_device_id asp_tbl[] = { | |||
126 | }; | 126 | }; |
127 | 127 | ||
128 | struct parisc_driver asp_driver = { | 128 | struct parisc_driver asp_driver = { |
129 | .name = "Asp", | 129 | .name = "asp", |
130 | .id_table = asp_tbl, | 130 | .id_table = asp_tbl, |
131 | .probe = asp_init_chip, | 131 | .probe = asp_init_chip, |
132 | }; | 132 | }; |
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 0e98a9d9834c..2bb1889c4c4f 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -1251,7 +1251,7 @@ static struct parisc_device_id ccio_tbl[] = { | |||
1251 | static int ccio_probe(struct parisc_device *dev); | 1251 | static int ccio_probe(struct parisc_device *dev); |
1252 | 1252 | ||
1253 | static struct parisc_driver ccio_driver = { | 1253 | static struct parisc_driver ccio_driver = { |
1254 | .name = "U2:Uturn", | 1254 | .name = "ccio", |
1255 | .id_table = ccio_tbl, | 1255 | .id_table = ccio_tbl, |
1256 | .probe = ccio_probe, | 1256 | .probe = ccio_probe, |
1257 | }; | 1257 | }; |
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 2f2dbef2c3b7..8c61705e67a5 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
@@ -1027,9 +1027,9 @@ static struct parisc_device_id dino_tbl[] = { | |||
1027 | }; | 1027 | }; |
1028 | 1028 | ||
1029 | static struct parisc_driver dino_driver = { | 1029 | static struct parisc_driver dino_driver = { |
1030 | .name = "Dino", | 1030 | .name = "dino", |
1031 | .id_table = dino_tbl, | 1031 | .id_table = dino_tbl, |
1032 | .probe = dino_driver_callback, | 1032 | .probe = dino_probe, |
1033 | }; | 1033 | }; |
1034 | 1034 | ||
1035 | /* | 1035 | /* |
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index 043d47aea75b..0afeedddf535 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c | |||
@@ -397,7 +397,7 @@ static struct parisc_device_id eisa_tbl[] = { | |||
397 | MODULE_DEVICE_TABLE(parisc, eisa_tbl); | 397 | MODULE_DEVICE_TABLE(parisc, eisa_tbl); |
398 | 398 | ||
399 | static struct parisc_driver eisa_driver = { | 399 | static struct parisc_driver eisa_driver = { |
400 | .name = "EISA Bus Adapter", | 400 | .name = "eisa_ba", |
401 | .id_table = eisa_tbl, | 401 | .id_table = eisa_tbl, |
402 | .probe = eisa_probe, | 402 | .probe = eisa_probe, |
403 | }; | 403 | }; |
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index e869c6020370..a6eae3e7c0cd 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c | |||
@@ -93,7 +93,7 @@ static struct parisc_device_id hppb_tbl[] = { | |||
93 | }; | 93 | }; |
94 | 94 | ||
95 | static struct parisc_driver hppb_driver = { | 95 | static struct parisc_driver hppb_driver = { |
96 | .name = "Gecko Boa", | 96 | .name = "gecko_boa", |
97 | .id_table = hppb_tbl, | 97 | .id_table = hppb_tbl, |
98 | .probe = hppb_probe, | 98 | .probe = hppb_probe, |
99 | }; | 99 | }; |
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c index cb84a4e84a2f..c776c372ae4e 100644 --- a/drivers/parisc/lasi.c +++ b/drivers/parisc/lasi.c | |||
@@ -233,7 +233,7 @@ static struct parisc_device_id lasi_tbl[] = { | |||
233 | }; | 233 | }; |
234 | 234 | ||
235 | struct parisc_driver lasi_driver = { | 235 | struct parisc_driver lasi_driver = { |
236 | .name = "Lasi", | 236 | .name = "lasi", |
237 | .id_table = lasi_tbl, | 237 | .id_table = lasi_tbl, |
238 | .probe = lasi_init_chip, | 238 | .probe = lasi_init_chip, |
239 | }; | 239 | }; |
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c index 4cbb6187cc44..123f4933d8f5 100644 --- a/drivers/scsi/lasi700.c +++ b/drivers/scsi/lasi700.c | |||
@@ -168,7 +168,7 @@ lasi700_driver_remove(struct parisc_device *dev) | |||
168 | } | 168 | } |
169 | 169 | ||
170 | static struct parisc_driver lasi700_driver = { | 170 | static struct parisc_driver lasi700_driver = { |
171 | .name = "Lasi SCSI", | 171 | .name = "lasi_scsi", |
172 | .id_table = lasi700_ids, | 172 | .id_table = lasi700_ids, |
173 | .probe = lasi700_probe, | 173 | .probe = lasi700_probe, |
174 | .remove = __devexit_p(lasi700_driver_remove), | 174 | .remove = __devexit_p(lasi700_driver_remove), |
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 189064607709..a12005b08bca 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
@@ -497,7 +497,7 @@ static struct parisc_device_id mux_tbl[] = { | |||
497 | MODULE_DEVICE_TABLE(parisc, mux_tbl); | 497 | MODULE_DEVICE_TABLE(parisc, mux_tbl); |
498 | 498 | ||
499 | static struct parisc_driver serial_mux_driver = { | 499 | static struct parisc_driver serial_mux_driver = { |
500 | .name = "Serial MUX", | 500 | .name = "serial_mux", |
501 | .id_table = mux_tbl, | 501 | .id_table = mux_tbl, |
502 | .probe = mux_probe, | 502 | .probe = mux_probe, |
503 | }; | 503 | }; |