diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
| commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
| tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /arch/arm/mach-mvebu/board-v7.c | |
| parent | nfsd: convert nfs4_file searches to use RCU (diff) | |
| parent | SUNRPC: Fix locking around callback channel reply receive (diff) | |
| download | linux-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.xz linux-56429e9b3be567a173bd05f5594faf8522c34d3a.zip | |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
Diffstat (limited to 'arch/arm/mach-mvebu/board-v7.c')
| -rw-r--r-- | arch/arm/mach-mvebu/board-v7.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c index 6478626e3ff6..d0d39f150fab 100644 --- a/arch/arm/mach-mvebu/board-v7.c +++ b/arch/arm/mach-mvebu/board-v7.c @@ -188,7 +188,7 @@ static void __init thermal_quirk(void) static void __init mvebu_dt_init(void) { - if (of_machine_is_compatible("plathome,openblocks-ax3-4")) + if (of_machine_is_compatible("marvell,armadaxp")) i2c_quirk(); if (of_machine_is_compatible("marvell,a375-db")) { external_abort_quirk(); |