summaryrefslogtreecommitdiffstats
path: root/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-16 10:07:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-16 10:07:00 -0400
commit9608f11d20f9c69ff4c624dcf421721221599255 (patch)
treee4ee1f9536259e294f860ed0a371b82e823e6c0f /arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
parentcd37906b18022c72b4599cb0af3cfbd1c001499c (diff)
downloadkernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.gz
kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.xz
kernel-9608f11d20f9c69ff4c624dcf421721221599255.zip
Linux v4.0-rc4
- Drop arm64 RCU revert patch. Should be fixed properly upstream now. - Disable debugging options.
Diffstat (limited to 'arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch')
-rw-r--r--arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
index 0d6ccd796..ba6949b88 100644
--- a/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
+++ b/arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch
@@ -9,10 +9,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index db880bf46135..c931ec7201c0 100644
+index 9688dda39e7a..8e3e77f3121f 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -102,6 +102,27 @@
+@@ -109,6 +109,27 @@
>;
};