diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-19 06:56:57 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-19 06:56:57 +0800 |
| commit | 3542f6b1836d8940615104e22248bb9b7cf54f5f (patch) | |
| tree | 6808fae6dfb12bb4b7e5e0df4efbe3e0dae8c537 /arch/arm/boot/dts/berlin2q-marvell-dmp.dts | |
| parent | d885d4f3728f386034bb2f7a61b7f2054c49b2d4 (diff) | |
| parent | ec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff) | |
| download | op-kernel-dev-3542f6b1836d8940615104e22248bb9b7cf54f5f.zip op-kernel-dev-3542f6b1836d8940615104e22248bb9b7cf54f5f.tar.gz | |
Merge 3.19-rc5 into char-misc-next
We want the 3.19-rc5 fixes in here for our testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/berlin2q-marvell-dmp.dts')
| -rw-r--r-- | arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts index 28e7e20..a98ac1b 100644 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@ -65,6 +65,8 @@ }; &sdhci2 { + broken-cd; + bus-width = <8>; non-removable; status = "okay"; }; |
