aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/88pm860x_onkey.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2011-03-07 10:43:12 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 05:42:06 -0400
commitc9f560b3d0222f6a6e3faeda324e786e230e4f20 (patch)
tree8ee05fa5c77f0442bffc740fc1f7adf7ab10ea6f /drivers/input/misc/88pm860x_onkey.c
parent22aad0011e4728a29bf3775b6f5e2f9677abd8c0 (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>
Diffstat (limited to 'drivers/input/misc/88pm860x_onkey.c')
-rw-r--r--drivers/input/misc/88pm860x_onkey.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c
index 4cc82826ea6b..3dca3c14510e 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)
74 info->chip = chip; 74 info->chip = chip;
75 info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion; 75 info->i2c = (chip->id == CHIP_PM8607) ? chip->client : chip->companion;
76 info->dev = &pdev->dev; 76 info->dev = &pdev->dev;
77 info->irq = irq + chip->irq_base; 77 info->irq = irq;
78 78
79 info->idev = input_allocate_device(); 79 info->idev = input_allocate_device();
80 if (!info->idev) { 80 if (!info->idev) {