summarylogtreecommitdiffstats
path: root/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado2017-02-28 07:29:07 -0300
committerAndré Fabian Silva Delgado2017-02-28 07:29:07 -0300
commit664541d19e4db2a37c498c8700be8b7288fda025 (patch)
tree8685b8f7b9b310411642cc6cf4bb4084a6b2b411 /0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
parentc7d42fc0b51c282c1a5768c69f625a0ad1232b21 (diff)
downloadaur-664541d19e4db2a37c498c8700be8b7288fda025.tar.gz
Update to 4.10.1_gnu-1
Diffstat (limited to '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch')
-rw-r--r--0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 719475bad3b1..ac44398c6f05 100644
--- a/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,7 +1,7 @@
-From c25c95072f199e0d0a56cbd4db701ab5b36a9f0c Mon Sep 17 00:00:00 2001
+From 3573189a2857cd66d248fb79e48a45ae70399c0b Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@xxxxxx>
Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
+Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
loader
The atags are parsed and if a Marvell atag is found, up to 4 MAC
@@ -17,7 +17,7 @@ Signed-off-by: Willy Tarreau <w@xxxxxx>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c
-index 9448aa0..ac7b6ae 100644
+index 9448aa0c6686..ac7b6ae6c00f 100644
--- a/arch/arm/boot/compressed/atags_to_fdt.c
+++ b/arch/arm/boot/compressed/atags_to_fdt.c
@@ -18,7 +18,7 @@ static int node_offset(void *fdt, const char *node_path)
@@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
}
--
-2.10.0
+2.11.0