diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:45 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:58 +0200 |
commit | c69f203df3e61414fbf1a66d130abfd7c3bf3fd0 (patch) | |
tree | a6850417a1871f7bf321ef0318bd8c43439d7fed /arch/arm/boot/dts/bcm958623hr.dts | |
parent | Merge tag 'perf-core-for-mingo-4.12-20170327' of git://git.kernel.org/pub/scm... (diff) | |
parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
download | linux-c69f203df3e61414fbf1a66d130abfd7c3bf3fd0.tar.xz linux-c69f203df3e61414fbf1a66d130abfd7c3bf3fd0.zip |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/bcm958623hr.dts')
-rw-r--r-- | arch/arm/boot/dts/bcm958623hr.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index c0a499d5ba44..d503fa0dde31 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -55,6 +55,7 @@ gpio-restart { compatible = "gpio-restart"; gpios = <&gpioa 15 GPIO_ACTIVE_LOW>; + open-source; priority = <200>; }; }; |