diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 21:59:11 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-03 19:20:06 +0200 |
| commit | 56e9e0f3a3c558b42db2dd5120d3a839e4beb282 (patch) | |
| tree | f639ac890abbbf990aa7d3ddee0830eae8f8d7a0 /drivers/spi | |
| parent | Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into ... (diff) | |
| parent | dts: Rename DW APB timer compatible strings (diff) | |
| download | linux-56e9e0f3a3c558b42db2dd5120d3a839e4beb282.tar.xz linux-56e9e0f3a3c558b42db2dd5120d3a839e4beb282.zip | |
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.c | 1 |
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); |