diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/misc/88pm860x_onkey.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/input/misc/88pm860x_onkey.c')
| -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 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) { |