Merge commit 'origin/master' into next

[pandora-kernel.git] / drivers / net / wireless / atmel_cs.c

diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 7740624..ddaa859 100644 (file)
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -279,7 +279,7 @@ static int atmel_config(struct pcmcia_device *link)
        struct pcmcia_device_id *did;
 
        dev = link->priv;
-       did = handle_to_dev(link).driver_data;
+       did = dev_get_drvdata(&handle_to_dev(link));
 
        DEBUG(0, "atmel_config(0x%p)\n", link);