diff options
| author | Dmitry Torokhov | 2017-02-21 00:16:02 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2017-02-21 00:16:02 +0100 |
| commit | 6e11617fcff3688f70650a3e40addb0043dda137 (patch) | |
| tree | a24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /drivers/input/keyboard/stmpe-keypad.c | |
| parent | Input: elan_i2c - add ELAN0605 to the ACPI table (diff) | |
| parent | Input: zet6223 - export OF device ID as module aliases (diff) | |
| download | kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.tar.gz kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.tar.xz kernel-qcow2-linux-6e11617fcff3688f70650a3e40addb0043dda137.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.11 merge window.
Diffstat (limited to 'drivers/input/keyboard/stmpe-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/stmpe-keypad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c index fe6e3f22eed7..8c6c0b9109c7 100644 --- a/drivers/input/keyboard/stmpe-keypad.c +++ b/drivers/input/keyboard/stmpe-keypad.c @@ -354,7 +354,7 @@ static int stmpe_keypad_probe(struct platform_device *pdev) input->id.bustype = BUS_I2C; input->dev.parent = &pdev->dev; - error = matrix_keypad_parse_of_params(&pdev->dev, &rows, &cols); + error = matrix_keypad_parse_properties(&pdev->dev, &rows, &cols); if (error) return error; |