Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / pcmcia / vrc4173_cardu.c

diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c
index cd0a315d922b5ae0f7b32c6e82a5b6155a0ddefd..d92692056e2498241f3d62ac1d45c7a19311a522 100644 (file)
--- a/drivers/pcmcia/vrc4173_cardu.c
+++ b/drivers/pcmcia/vrc4173_cardu.c
@@ -456,7 +456,7 @@ static void cardu_interrupt(int irq, void *dev_id)
        }
 }
 
-static int __devinit vrc4173_cardu_probe(struct pci_dev *dev,
+static int vrc4173_cardu_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
        vrc4173_socket_t *socket;
@@ -533,7 +533,7 @@ disable:
        return ret;
 }
 
-static int __devinit vrc4173_cardu_setup(char *options)
+static int vrc4173_cardu_setup(char *options)
 {
        if (options == NULL || *options == '\0')
                return 1;
@@ -574,14 +574,14 @@ static struct pci_driver vrc4173_cardu_driver = {
        .id_table       = vrc4173_cardu_id_table,
 };
 
-static int __devinit vrc4173_cardu_init(void)
+static int vrc4173_cardu_init(void)
 {
        vrc4173_cardu_slots = 0;
 
        return pci_register_driver(&vrc4173_cardu_driver);
 }
 
-static void __devexit vrc4173_cardu_exit(void)
+static void vrc4173_cardu_exit(void)
 {
        pci_unregister_driver(&vrc4173_cardu_driver);
 }