Commit 4a1d2d81 authored by Helge Deller's avatar Helge Deller Committed by Jeff Garzik

[PATCH] Fix section mismatch in de2104x.c

WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20)
WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28)
Signed-off-by: default avatarHelge Deller <deller@parisc-linux.org>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 6e532cfe
...@@ -1730,7 +1730,7 @@ static void __init de21040_get_media_info(struct de_private *de) ...@@ -1730,7 +1730,7 @@ static void __init de21040_get_media_info(struct de_private *de)
} }
/* Note: this routine returns extra data bits for size detection. */ /* Note: this routine returns extra data bits for size detection. */
static unsigned __init tulip_read_eeprom(void __iomem *regs, int location, int addr_len) static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
{ {
int i; int i;
unsigned retval = 0; unsigned retval = 0;
...@@ -1926,7 +1926,7 @@ bad_srom: ...@@ -1926,7 +1926,7 @@ bad_srom:
goto fill_defaults; goto fill_defaults;
} }
static int __init de_init_one (struct pci_dev *pdev, static int __devinit de_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
...@@ -2082,7 +2082,7 @@ err_out_free: ...@@ -2082,7 +2082,7 @@ err_out_free:
return rc; return rc;
} }
static void __exit de_remove_one (struct pci_dev *pdev) static void __devexit de_remove_one (struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct de_private *de = dev->priv; struct de_private *de = dev->priv;
...@@ -2164,7 +2164,7 @@ static struct pci_driver de_driver = { ...@@ -2164,7 +2164,7 @@ static struct pci_driver de_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = de_pci_tbl, .id_table = de_pci_tbl,
.probe = de_init_one, .probe = de_init_one,
.remove = __exit_p(de_remove_one), .remove = __devexit_p(de_remove_one),
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = de_suspend, .suspend = de_suspend,
.resume = de_resume, .resume = de_resume,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment