diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:04:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-29 09:04:01 +0100 |
| commit | 0a7348925f58839fbb4c86b7e34f43b91beb0586 (patch) | |
| tree | 8db1b38503cc444f78b13ed1a3d6816708cf181c /arch/arm/boot/dts/am57xx-cl-som-am57x.dts | |
| parent | ce1984cc45ccf943f1b78b1674dfdbe5df2d45a9 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| download | linux-next-0a7348925f58839fbb4c86b7e34f43b91beb0586.tar.gz | |
Merge tag 'v4.5-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/am57xx-cl-som-am57x.dts')
| -rw-r--r-- | arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts index 8d93882dc8d5..1c06cb76da07 100644 --- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts +++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts @@ -545,7 +545,7 @@ ti,debounce-tol = /bits/ 16 <10>; ti,debounce-rep = /bits/ 16 <1>; - linux,wakeup; + wakeup-source; }; }; |