diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:50:22 -0500 |
commit | f85272a97825d4a67098a8ad70fa5efb55e4847a (patch) | |
tree | e55b38e21b45213269057417032db4440e8f5eed /sound/pci/ice1712 | |
parent | 1c72d8d90da3b29540c3c281a3e0b743ee6b6f74 (diff) | |
parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) |
Merge branch 'master'
Diffstat (limited to 'sound/pci/ice1712')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 1 | ||||
-rw-r--r-- | sound/pci/ice1712/ice1724.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index 5aca37798c32..bd71bf424549 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2735,7 +2735,6 @@ static void __devexit snd_ice1712_remove(struct pci_dev *pci) | |||
2735 | 2735 | ||
2736 | static struct pci_driver driver = { | 2736 | static struct pci_driver driver = { |
2737 | .name = "ICE1712", | 2737 | .name = "ICE1712", |
2738 | .owner = THIS_MODULE, | ||
2739 | .id_table = snd_ice1712_ids, | 2738 | .id_table = snd_ice1712_ids, |
2740 | .probe = snd_ice1712_probe, | 2739 | .probe = snd_ice1712_probe, |
2741 | .remove = __devexit_p(snd_ice1712_remove), | 2740 | .remove = __devexit_p(snd_ice1712_remove), |
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 5b4293f5a652..0b5389ee26d5 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
@@ -2332,7 +2332,6 @@ static void __devexit snd_vt1724_remove(struct pci_dev *pci) | |||
2332 | 2332 | ||
2333 | static struct pci_driver driver = { | 2333 | static struct pci_driver driver = { |
2334 | .name = "ICE1724", | 2334 | .name = "ICE1724", |
2335 | .owner = THIS_MODULE, | ||
2336 | .id_table = snd_vt1724_ids, | 2335 | .id_table = snd_vt1724_ids, |
2337 | .probe = snd_vt1724_probe, | 2336 | .probe = snd_vt1724_probe, |
2338 | .remove = __devexit_p(snd_vt1724_remove), | 2337 | .remove = __devexit_p(snd_vt1724_remove), |