diff options
| author | Olof Johansson <olof@lixom.net> | 2015-09-27 08:23:26 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-09-27 08:23:26 +0300 |
| commit | e46fc90ec2612ef7578c6e3e28ad477a116e24da (patch) | |
| tree | 99668ecce537d7381b8545e0a7b34dda4ef81935 /arch/arm/plat-pxa/ssp.c | |
| parent | b8ba826f8d9587fe830d29a0d03abb5b1e0a76e5 (diff) | |
| parent | 385877c01361401113c101ef5a80a9f0998e072b (diff) | |
| download | linux-e46fc90ec2612ef7578c6e3e28ad477a116e24da.tar.xz | |
Merge tag 'pxa-fixes-v4.3' of https://github.com/rjarzmik/linux into fixes
ARM: pxa: fixes for v4.3
These fixes are mainly regression fixes triggered by irq changes,
common clock framework introduction and sound side-effect of
other platforms.
* tag 'pxa-fixes-v4.3' of https://github.com/rjarzmik/linux:
ARM: pxa: balloon3: Fix build error
ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding
ARM: pxa: fix DFI bus lockups on startup
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-pxa/ssp.c')
| -rw-r--r-- | arch/arm/plat-pxa/ssp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c index ad9529cc4203..daa1a65f2eb7 100644 --- a/arch/arm/plat-pxa/ssp.c +++ b/arch/arm/plat-pxa/ssp.c @@ -107,7 +107,6 @@ static const struct of_device_id pxa_ssp_of_ids[] = { { .compatible = "mvrl,pxa168-ssp", .data = (void *) PXA168_SSP }, { .compatible = "mrvl,pxa910-ssp", .data = (void *) PXA910_SSP }, { .compatible = "mrvl,ce4100-ssp", .data = (void *) CE4100_SSP }, - { .compatible = "mrvl,lpss-ssp", .data = (void *) LPSS_SSP }, { }, }; MODULE_DEVICE_TABLE(of, pxa_ssp_of_ids); |