diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:31:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 16:31:22 +0200 |
| commit | ab2a0e0d135490729e384c1826d118f92e88cae8 (patch) | |
| tree | 58ab1e9e5d549feac9bf3beacbb6942f50d0bed9 /drivers/input/misc/pmic8xxx-pwrkey.c | |
| parent | 09dd9b39abf85b8fae3ea105a81825478dd227b6 (diff) | |
| parent | 2f3ab04a47c9b5e7c93400601e8f69bef0fa184a (diff) | |
Merge branch 'next-samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Diffstat (limited to 'drivers/input/misc/pmic8xxx-pwrkey.c')
| -rw-r--r-- | drivers/input/misc/pmic8xxx-pwrkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c index 97e07e786e4..b3cfb9c71e6 100644 --- a/drivers/input/misc/pmic8xxx-pwrkey.c +++ b/drivers/input/misc/pmic8xxx-pwrkey.c @@ -90,7 +90,8 @@ static int __devinit pmic8xxx_pwrkey_probe(struct platform_device *pdev) unsigned int delay; u8 pon_cntl; struct pmic8xxx_pwrkey *pwrkey; - const struct pm8xxx_pwrkey_platform_data *pdata = mfd_get_data(pdev); + const struct pm8xxx_pwrkey_platform_data *pdata = + dev_get_platdata(&pdev->dev); if (!pdata) { dev_err(&pdev->dev, "power key platform data not supplied\n"); |