summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-08-29 12:59:11 -0700
committerOlof Johansson <olof@lixom.net>2013-09-03 10:20:06 -0700
commit56e9e0f3a3c558b42db2dd5120d3a839e4beb282 (patch)
treef639ac890abbbf990aa7d3ddee0830eae8f8d7a0 /drivers/spi
parent103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (diff)
parent620f5e1cbfc16aa1bd39c2c5386aee4d00850641 (diff)
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/spi')
-rw-r--r--drivers/spi/spi-altera.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 81b9adb6e766..7456eef201a6 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -302,6 +302,7 @@ static int altera_spi_remove(struct platform_device *dev)
#ifdef CONFIG_OF
static const struct of_device_id altera_spi_match[] = {
{ .compatible = "ALTR,spi-1.0", },
+ { .compatible = "altr,spi-1.0", },
{},
};
MODULE_DEVICE_TABLE(of, altera_spi_match);