diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-26 10:11:52 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-26 10:11:52 -0400 |
commit | dbc4098dbceb470d7f4dbb11d0ad64d1100ed544 (patch) | |
tree | 678e48337bd23645662f7e1a9b560d1e22fa4b12 /arm-dts-am335x-bone-common-add-uart2_pins-uart4_pins.patch | |
parent | 96dba40a7714f4feaac45f76e3701fb3c2d822da (diff) | |
download | kernel-dbc4098dbceb470d7f4dbb11d0ad64d1100ed544.tar.gz kernel-dbc4098dbceb470d7f4dbb11d0ad64d1100ed544.tar.xz kernel-dbc4098dbceb470d7f4dbb11d0ad64d1100ed544.zip |
Linux v3.17-rc2
- Fixup ARM MFD options after I2C=y change
- 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.patch | 6 |
1 files changed, 3 insertions, 3 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 8587fcd84..d450465df 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 @@ -1,4 +1,4 @@ -From 5aacf54210c1147d771cdb52b7a1f3cf69a39a8c Mon Sep 17 00:00:00 2001 +From d0bb5aa9ffb293df4189cab67f8de0b21412aaf9 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Thu, 13 Mar 2014 14:18:52 -0500 Subject: [PATCH] arm: dts: am335x-bone-common: add @@ -10,10 +10,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 db4518ef755d..c983caab7d9b 100644 +index 86cdb52dbf8a..db4518ef755d 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi -@@ -126,6 +126,27 @@ +@@ -105,6 +105,27 @@ >; }; |