diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-03-07 23:43:12 +0800 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 17:59:16 -0400 |
| commit | 90f5d06efe36ffce01ab1a3563e5530f53c4844d (patch) | |
| tree | 0cb32936a1a42af1470e8fe9b3f922d353126462 /drivers/input | |
| parent | 1e75144a6926646a1195b77a1d6ac389eb3415bf (diff) | |
mfd: Adopt mfd_data in 88pm860x input driver
Copy 88pm860x platform data into different mfd_data structure for
onkey/touch/codec/power driver. So move the identification of
device node from those drivers to mfd driver.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
(cherry picked from commit c9f560b3d0222f6a6e3faeda324e786e230e4f20)
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/misc/88pm860x_onkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c index 4cc82826ea6..3dca3c14510 100644 --- a/drivers/input/misc/88pm860x_onkey.c +++ b/drivers/input/misc/88pm860x_onkey.c @@ -74,7 +74,7 @@ static int __devinit pm860x_onkey_probe(struct platform_device *pdev) info->chip = chip; info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion; info->dev = &pdev->dev; - info->irq = irq + chip->irq_base; + info->irq = irq; info->idev = input_allocate_device(); if (!info->idev) { |