diff options
author | Ingo Molnar | 2016-07-07 10:35:28 +0200 |
---|---|---|
committer | Ingo Molnar | 2016-07-07 10:35:28 +0200 |
commit | 4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch) | |
tree | 1026418471fe10c5b9f2fdff8a6b49bf070938fc /arch/arm/boot/dts/sun6i-a31s-primo81.dts | |
parent | tick/broadcast-hrtimer: Set name of the ce_broadcast_hrtimer (diff) | |
parent | timers: Implement optimization for same expiry time in mod_timer() (diff) | |
download | kernel-qcow2-linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.gz kernel-qcow2-linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.xz kernel-qcow2-linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.zip |
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31s-primo81.dts')
-rw-r--r-- | arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts index 68b479b8772c..73c133f5e79c 100644 --- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts +++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts @@ -176,8 +176,6 @@ }; ®_dc1sw { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; regulator-name = "vcc-lcd"; }; |