diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 19:59:11 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-03 17:20:06 (GMT) |
| commit | 56e9e0f3a3c558b42db2dd5120d3a839e4beb282 (patch) | |
| tree | f639ac890abbbf990aa7d3ddee0830eae8f8d7a0 /drivers/input | |
| parent | 103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (diff) | |
| parent | 620f5e1cbfc16aa1bd39c2c5386aee4d00850641 (diff) | |
| download | linux-fsl-qoriq-56e9e0f3a3c558b42db2dd5120d3a839e4beb282.tar.xz | |
Merge branch 'socfpga/dt' into next/dt
SoCFPGA DT changes from Dinh Nguyen.
* socfpga/dt:
dts: Rename DW APB timer compatible strings
dts: Deprecate ALTR as a vendor prefix
of: add vendor prefix for Altera Corp.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/altera_ps2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index a0a2657..4777a73 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c @@ -176,6 +176,7 @@ static int altera_ps2_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id altera_ps2_match[] = { { .compatible = "ALTR,ps2-1.0", }, + { .compatible = "altr,ps2-1.0", }, {}, }; MODULE_DEVICE_TABLE(of, altera_ps2_match); |