Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells...

[cascardo/linux.git] / drivers / net / wan / pc300too.c

diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 5fe246e..53efc57 100644 (file)
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -297,8 +297,8 @@ static const struct net_device_ops pc300_ops = {
        .ndo_do_ioctl   = pc300_ioctl,
 };
 
-static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
-                                       const struct pci_device_id *ent)
+static int pc300_pci_init_one(struct pci_dev *pdev,
+                             const struct pci_device_id *ent)
 {
        card_t *card;
        u32 __iomem *p;