diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-06 18:31:36 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-06 18:31:36 +0300 |
commit | d2ce98ca0a192e1bcb89068adfe6cb736f5e351c (patch) | |
tree | 888ccaba7b3e09bf4b81324dff38a65f5667296c /arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | |
parent | 85eae57bbb0612387201635659be543aaac2109e (diff) | |
parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
download | linux-d2ce98ca0a192e1bcb89068adfe6cb736f5e351c.tar.xz |
Merge tag 'v4.18-rc6' into HEAD
Pull bug fixes into the KVM development tree to avoid nasty conflicts.
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts index 3e3eb31748a3..f63bceb88caa 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -234,9 +234,6 @@ bus-width = <4>; cap-sd-highspeed; - sd-uhs-sdr12; - sd-uhs-sdr25; - sd-uhs-sdr50; max-frequency = <100000000>; disable-wp; |