diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-08-08 05:36:26 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-09-29 11:20:24 -0400 |
commit | 2e9b981a7c63ee8278df6823f8389d69dad1a499 (patch) | |
tree | 7d88e2a03a3202ba26ce7dbcf6909e28d44f690c /drivers/net/wireless/orinoco | |
parent | 1cc745d1cdca8086b472a06671f0830fc0e98861 (diff) |
pcmcia: move driver name to struct pcmcia_driver
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r-- | drivers/net/wireless/orinoco/orinoco_cs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/orinoco/spectrum_cs.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 263dfe9e0e30..28212661f34a 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c | |||
@@ -378,9 +378,7 @@ MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids); | |||
378 | 378 | ||
379 | static struct pcmcia_driver orinoco_driver = { | 379 | static struct pcmcia_driver orinoco_driver = { |
380 | .owner = THIS_MODULE, | 380 | .owner = THIS_MODULE, |
381 | .drv = { | 381 | .name = DRIVER_NAME, |
382 | .name = DRIVER_NAME, | ||
383 | }, | ||
384 | .probe = orinoco_cs_probe, | 382 | .probe = orinoco_cs_probe, |
385 | .remove = orinoco_cs_detach, | 383 | .remove = orinoco_cs_detach, |
386 | .id_table = orinoco_cs_ids, | 384 | .id_table = orinoco_cs_ids, |
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index 78446507873f..5906e9af9064 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -361,9 +361,7 @@ MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids); | |||
361 | 361 | ||
362 | static struct pcmcia_driver orinoco_driver = { | 362 | static struct pcmcia_driver orinoco_driver = { |
363 | .owner = THIS_MODULE, | 363 | .owner = THIS_MODULE, |
364 | .drv = { | 364 | .name = DRIVER_NAME, |
365 | .name = DRIVER_NAME, | ||
366 | }, | ||
367 | .probe = spectrum_cs_probe, | 365 | .probe = spectrum_cs_probe, |
368 | .remove = spectrum_cs_detach, | 366 | .remove = spectrum_cs_detach, |
369 | .suspend = spectrum_cs_suspend, | 367 | .suspend = spectrum_cs_suspend, |