diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 23:36:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-23 23:36:48 +0300 |
| commit | 807dc0668e7af56a49cf360c2d12f9b04083ac47 (patch) | |
| tree | adaa1c3ec5d7c39b5ebe62e45825c029e179cecf /arch/arm/boot/dts/am335x-bone.dts | |
| parent | 5e790610bc19887387d5914cf8ed58434c5bde08 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| download | linux-807dc0668e7af56a49cf360c2d12f9b04083ac47.tar.xz | |
Merge 4.0-rc5 into staging-testing
We want the staging tree fixes that are upstream here as well to prevent
merge conflicts from people trying to clean up code.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/am335x-bone.dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-bone.dts | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index 83d40f7655e5..6b8493720424 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -24,11 +24,3 @@ &mmc1 { vmmc-supply = <&ldo3_reg>; }; - -&sham { - status = "okay"; -}; - -&aes { - status = "okay"; -}; |