diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-09-27 11:56:14 -0300 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2013-09-27 11:56:14 -0300 |
| commit | 1025c04cecd19882e28f16c4004034b475c372c5 (patch) | |
| tree | 2b7402887e86d54bff5a123228c9059eae5e32bd /drivers/ide/gayle.c | |
| parent | 4375f1037d52602413142e290608d0d84671ad36 (diff) | |
| parent | 5bcecf325378218a8e248bb6bcae96ec7362f8ef (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_core.c
Diffstat (limited to 'drivers/ide/gayle.c')
| -rw-r--r-- | drivers/ide/gayle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c index 0a8440ae056..97a2f9dc75d 100644 --- a/drivers/ide/gayle.c +++ b/drivers/ide/gayle.c @@ -132,7 +132,7 @@ static int __init amiga_gayle_ide_probe(struct platform_device *pdev) if (!request_mem_region(res->start, resource_size(res), "IDE")) return -EBUSY; - pdata = pdev->dev.platform_data; + pdata = dev_get_platdata(&pdev->dev); pr_info("ide: Gayle IDE controller (A%u style%s)\n", pdata->explicit_ack ? 1200 : 4000, ide_doubler ? ", IDE doubler" : ""); |