[kernel] r19966 - dists/sid/linux/debian/patches/features/arm
Ben Hutchings
benh at alioth.debian.org
Mon Apr 1 01:22:55 UTC 2013
Author: benh
Date: Mon Apr 1 01:22:54 2013
New Revision: 19966
Log:
Change Kirkwood patch headers to DEP-3 and usual upstream commit reference format
Modified:
dists/sid/linux/debian/patches/features/arm/kirkwood-add-configuration-for-mpp12-as-gpio.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-add-dreamplug-fdt-support.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-absorb-kirkwood_init.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-convert-uart0-to-devicetree.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-define-uart01-as-disabled.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-facilitate-new-boards-during-fdt-migration.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-use-mrvl-ticker-symbol.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-rtc-mv-devicetree-bindings.patch
dists/sid/linux/debian/patches/features/arm/kirkwood-use-devicetree-for-rtc-mv.patch
dists/sid/linux/debian/patches/features/arm/kirkwood_add_missing_kexec_h.patch
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-add-configuration-for-mpp12-as-gpio.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-add-configuration-for-mpp12-as-gpio.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-add-configuration-for-mpp12-as-gpio.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,17 +1,17 @@
-commit 527ef0550d79e3b3a0ef8f5061072075afef6aaf
-Author: Arnaud Patard <arnaud.patard at rtp-net.org>
-Date: Thu Dec 1 11:58:25 2011 +0100
+From: Arnaud Patard <arnaud.patard at rtp-net.org>
+Date: Thu Dec 1 11:58:25 2011 +0100
+Subject: ARM: Kirkwood: Add configuration for MPP12 as GPIO
- ARM: Kirkwood: Add configuration for MPP12 as GPIO
-
- The MPP12 is listed in the 6281 HW manual as output only but the iconnect
- board from iomega is using it as GPIO (there's a button connected on it). So,
- I'm adding a definition for the MPP12 as GPIO. As I've no informations about
- this and which kirkwood are "affected", I'm adding a new #define instead of
- modifying the current one for MPP12.
-
- Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
- Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
+commit 527ef0550d79e3b3a0ef8f5061072075afef6aaf upstream.
+
+The MPP12 is listed in the 6281 HW manual as output only but the iconnect
+board from iomega is using it as GPIO (there's a button connected on it). So,
+I'm adding a definition for the MPP12 as GPIO. As I've no informations about
+this and which kirkwood are "affected", I'm adding a new #define instead of
+modifying the current one for MPP12.
+
+Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+Signed-off-by: Nicolas Pitre <nico at fluxnic.net>
Index: sid/arch/arm/mach-kirkwood/mpp.h
===================================================================
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-add-dreamplug-fdt-support.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-add-dreamplug-fdt-support.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-add-dreamplug-fdt-support.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,26 +1,26 @@
-commit 3d468b6d6052293ad3b8538b8277077981c28286
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Mon Feb 27 16:07:13 2012 +0000
-
- ARM: kirkwood: add dreamplug (fdt) support.
-
- Initially, copied guruplug-setup.c and did s/guruplug/dreamplug/g.
- Then, switched to SPI based NOR flash.
-
- After talking to Arnd Bergman, chose an incremental approach to adding
- devicetree support. First, we use the dtb to tell us we are on the
- dreamplug, then we gradually port over drivers.
-
- Driver porting will start with the uart (see next patch), and progress
- from there. Possibly, spi/flash/partitions will be next.
-
- When done, board-dt.c will no longer be dreamplug specific, and dt's can
- be made for the other kirkwood boards.
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
- Reviewed-by: Arnd Bergmann <arnd at arndb.de>
- Acked-by: Nicolas Pitre <nico at linaro.org>
- Signed-off-by: Arnd Bergmann <arnd at arndb.de>
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Mon Feb 27 16:07:13 2012 +0000
+Subject: ARM: kirkwood: add dreamplug (fdt) support.
+
+commit 3d468b6d6052293ad3b8538b8277077981c28286 upstream.
+
+Initially, copied guruplug-setup.c and did s/guruplug/dreamplug/g.
+Then, switched to SPI based NOR flash.
+
+After talking to Arnd Bergman, chose an incremental approach to adding
+devicetree support. First, we use the dtb to tell us we are on the
+dreamplug, then we gradually port over drivers.
+
+Driver porting will start with the uart (see next patch), and progress
+from there. Possibly, spi/flash/partitions will be next.
+
+When done, board-dt.c will no longer be dreamplug specific, and dt's can
+be made for the other kirkwood boards.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+Reviewed-by: Arnd Bergmann <arnd at arndb.de>
+Acked-by: Nicolas Pitre <nico at linaro.org>
+Signed-off-by: Arnd Bergmann <arnd at arndb.de>
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
new file mode 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-add-iconnect-support.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,14 +1,14 @@
-commit c06cd9bfcad4960023bac1f052da748824e24961
-Author: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
-Date: Wed Apr 18 23:16:41 2012 +0200
+From: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
+Date: Wed Apr 18 23:16:41 2012 +0200
+Subject: kirkwood: Add iconnect support
- kirkwood: Add iconnect support
-
- Add support for Iomega Iconnect system.
-
- Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
- Tested-By: Adam Baker <linux at baker-net.org.uk>
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit c06cd9bfcad4960023bac1f052da748824e24961 upstream.
+
+Add support for Iomega Iconnect system.
+
+Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+Tested-By: Adam Baker <linux at baker-net.org.uk>
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
Index: sid/arch/arm/boot/dts/kirkwood-iconnect.dts
===================================================================
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-create-a-generic-function-for-gpio-led-blinking.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,16 +1,16 @@
-commit ff3e660b5a881b401b2b6735aa5334f433237dcb
-Author: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
-Date: Wed Apr 18 23:16:40 2012 +0200
+From: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
+Date: Wed Apr 18 23:16:40 2012 +0200
+Subject: orion/kirkwood: create a generic function for gpio led blinking
- orion/kirkwood: create a generic function for gpio led blinking
-
- dns323 and (at least) iconnect platforms are using hw led blinking, so,
- instead of having 2 identicals .gpio_blink_set gpio-led hooks, move
- dns323 code into gpio.c
-
- Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
- Tested-By: Adam Baker <linux at baker-net.org.uk>
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit ff3e660b5a881b401b2b6735aa5334f433237dcb upstream.
+
+dns323 and (at least) iconnect platforms are using hw led blinking, so,
+instead of having 2 identicals .gpio_blink_set gpio-led hooks, move
+dns323 code into gpio.c
+
+Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+Tested-By: Adam Baker <linux at baker-net.org.uk>
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index c3ed15b..13d2bec 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-absorb-kirkwood_init.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-absorb-kirkwood_init.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-absorb-kirkwood_init.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,18 +1,18 @@
-commit 2b45e05f51a79c2818523c923dfe008b8b2f4227
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Wed Feb 29 17:39:08 2012 +0000
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Wed Feb 29 17:39:08 2012 +0000
+Subject: ARM: kirkwood: fdt: absorb kirkwood_init()
- ARM: kirkwood: fdt: absorb kirkwood_init()
-
- We need to absorb kirkwood_init() into kirkwood_dt_init() so that as we
- convert drivers, we can remove the platform call, eg
- kirkwood_rtc_init(). This maintains compatibility with non-fdt
- configurations because they still call kirkwood_init() in common.c.
-
- As drivers are converted, we will reinstate the 'static' qualifier in
- common.c.
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit 2b45e05f51a79c2818523c923dfe008b8b2f4227 upstream.
+
+We need to absorb kirkwood_init() into kirkwood_dt_init() so that as we
+convert drivers, we can remove the platform call, eg
+kirkwood_rtc_init(). This maintains compatibility with non-fdt
+configurations because they still call kirkwood_init() in common.c.
+
+As drivers are converted, we will reinstate the 'static' qualifier in
+common.c.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
Index: sid/arch/arm/mach-kirkwood/board-dt.c
===================================================================
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-convert-uart0-to-devicetree.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-convert-uart0-to-devicetree.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-convert-uart0-to-devicetree.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,16 +1,16 @@
-commit 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Mon Feb 27 16:07:14 2012 +0000
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Mon Feb 27 16:07:14 2012 +0000
+Subject: ARM: kirkwood: convert uart0 to devicetree.
- ARM: kirkwood: convert uart0 to devicetree.
-
- This uart is the primary console for the dreamplug. Removed
- kirkwood_uart0_init() call from board-dt.c.
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
- Reviewed-by: Arnd Bergmann <arnd at arndb.de>
- Acked-by: Nicolas Pitre <nico at linaro.org>
- Signed-off-by: Arnd Bergmann <arnd at arndb.de>
+commit 759a45185ac0e4dfaf8bbfcb390ec73aca4b7a34 upstream.
+
+This uart is the primary console for the dreamplug. Removed
+kirkwood_uart0_init() call from board-dt.c.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+Reviewed-by: Arnd Bergmann <arnd at arndb.de>
+Acked-by: Nicolas Pitre <nico at linaro.org>
+Signed-off-by: Arnd Bergmann <arnd at arndb.de>
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 0424d99..8a5dff8 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-define-uart01-as-disabled.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-define-uart01-as-disabled.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-define-uart01-as-disabled.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,17 +1,17 @@
-commit 163f2cea673a4ae831ad2cd26d8f01977c3add93
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Thu Mar 15 01:00:27 2012 +0000
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Thu Mar 15 01:00:27 2012 +0000
+Subject: ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
- ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
-
- Define both uarts in kirkwood.dtsi as they are common to all kirkwood
- SoCs. Each board may enable all or none of them, so they are disabled
- by default. uart0 is enabled for the dreamplug.
-
- tclk can vary for each board, so we leave it undefined in the kirkwood
- dtsi. Each board can then set it as appropriate when enabling the uart.
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit 163f2cea673a4ae831ad2cd26d8f01977c3add93 upstream.
+
+Define both uarts in kirkwood.dtsi as they are common to all kirkwood
+SoCs. Each board may enable all or none of them, so they are disabled
+by default. uart0 is enabled for the dreamplug.
+
+tclk can vary for each board, so we leave it undefined in the kirkwood
+dtsi. Each board can then set it as appropriate when enabling the uart.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 333f11b..a5376b8 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-facilitate-new-boards-during-fdt-migration.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-facilitate-new-boards-during-fdt-migration.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-facilitate-new-boards-during-fdt-migration.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,14 +1,14 @@
-commit 6fa6b8781fbd5e6cd5e313c5e3bdd73b426d8f30
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Thu Mar 15 00:52:31 2012 +0000
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Thu Mar 15 00:52:31 2012 +0000
+Subject: ARM: kirkwood: fdt: facilitate new boards during fdt migration
- ARM: kirkwood: fdt: facilitate new boards during fdt migration
-
- Move all dreamplug-specific code out of board-dt.c and into
- board-dreamplug.c. This way new boards that are added during the
- conversion to fdt don't clutter up board-dt.c.
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit 6fa6b8781fbd5e6cd5e313c5e3bdd73b426d8f30 upstream.
+
+Move all dreamplug-specific code out of board-dt.c and into
+board-dreamplug.c. This way new boards that are added during the
+conversion to fdt don't clutter up board-dt.c.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
Index: sid/arch/arm/mach-kirkwood/Makefile
===================================================================
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-use-mrvl-ticker-symbol.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-use-mrvl-ticker-symbol.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-fdt-use-mrvl-ticker-symbol.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,12 +1,12 @@
-commit b77816dea3e4c0f815510dea2a0ca9bcda6644dc
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Wed Mar 7 15:03:57 2012 +0000
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Wed Mar 7 15:03:57 2012 +0000
+Subject: ARM: kirkwood: fdt: use mrvl ticker symbol
- ARM: kirkwood: fdt: use mrvl ticker symbol
-
- Also, use inclusive register size for uart0.
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit b77816dea3e4c0f815510dea2a0ca9bcda6644dc upstream.
+
+Also, use inclusive register size for uart0.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 8a5dff8..333f11b 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-fix-orion_gpio_set_blink.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,16 +1,16 @@
-commit 92a486eabefadca1169fbf15d737feeaf2bda844
-Author: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
-Date: Wed Apr 18 23:16:39 2012 +0200
+From: Arnaud Patard (Rtp) <arnaud.patard at rtp-net.org>
+Date: Wed Apr 18 23:16:39 2012 +0200
+Subject: kirkwood/orion: fix orion_gpio_set_blink
- kirkwood/orion: fix orion_gpio_set_blink
-
- gpio registers are for 32 gpios. Given that orion_gpio_set_blink is called
- directly and not through gpiolib, it needs to make sure that the pin value
- given to the internal functions are between 0 and 31.
-
- Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
- Tested-By: Adam Baker <linux at baker-net.org.uk>
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit 92a486eabefadca1169fbf15d737feeaf2bda844 upstream.
+
+gpio registers are for 32 gpios. Given that orion_gpio_set_blink is called
+directly and not through gpiolib, it needs to make sure that the pin value
+given to the internal functions are between 0 and 31.
+
+Signed-off-by: Arnaud Patard <arnaud.patard at rtp-net.org>
+Tested-By: Adam Baker <linux at baker-net.org.uk>
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 10d1608..d3401e7 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-rtc-mv-devicetree-bindings.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-rtc-mv-devicetree-bindings.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-rtc-mv-devicetree-bindings.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,12 +1,12 @@
-commit ea983ede1195982c64220e9030c28ff111c8655c
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Tue Mar 6 23:53:57 2012 +0000
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Tue Mar 6 23:53:57 2012 +0000
+Subject: ARM: kirkwood: rtc-mv devicetree bindings
- ARM: kirkwood: rtc-mv devicetree bindings
-
- Trivial conversion to devicetree.
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit ea983ede1195982c64220e9030c28ff111c8655c upstream.
+
+Trivial conversion to devicetree.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index 768e2ed..0dd8421 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood-use-devicetree-for-rtc-mv.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood-use-devicetree-for-rtc-mv.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood-use-devicetree-for-rtc-mv.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,11 +1,11 @@
-commit e871b87a1e978e618c75acd4ceb6cd4699728691
-Author: Jason Cooper <jason at lakedaemon.net>
-Date: Tue Mar 6 23:55:04 2012 +0000
+From: Jason Cooper <jason at lakedaemon.net>
+Date: Tue Mar 6 23:55:04 2012 +0000
+Subject: ARM: kirkwood: use devicetree for rtc-mv
- ARM: kirkwood: use devicetree for rtc-mv
-
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
- Acked-by: Arnd Bergmann <arnd at arndb.de>
+commit e871b87a1e978e618c75acd4ceb6cd4699728691 upstream.
+
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+Acked-by: Arnd Bergmann <arnd at arndb.de>
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 825310b..3474ef8 100644
Modified: dists/sid/linux/debian/patches/features/arm/kirkwood_add_missing_kexec_h.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/arm/kirkwood_add_missing_kexec_h.patch Mon Apr 1 01:09:55 2013 (r19965)
+++ dists/sid/linux/debian/patches/features/arm/kirkwood_add_missing_kexec_h.patch Mon Apr 1 01:22:54 2013 (r19966)
@@ -1,20 +1,20 @@
-commit a7ac56de8316c0eb1111824c9add045cac2bd7a2
-Author: Ian Campbell <ijc at hellion.org.uk>
-Date: Sun Apr 29 14:40:42 2012 +0100
+From: Ian Campbell <ijc at hellion.org.uk>
+Date: Sun Apr 29 14:40:42 2012 +0100
+Subject: ARM: kirkwood: add missing kexec.h include
- ARM: kirkwood: add missing kexec.h include
-
- Fixes the following build error when CONFIG_KEXEC is enabled:
- CC arch/arm/mach-kirkwood/board-dt.o
- arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
- arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
- arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
-
- Signed-off-by: Ian Campbell <ijc at hellion.org.uk>
- [v4, rebase onto recent Linus for repost]
- [v3, speak actual English in the commit message, thanks Sergei Shtylyov]
- [v2, using linux/kexec.h not asm/kexec.h]
- Signed-off-by: Jason Cooper <jason at lakedaemon.net>
+commit a7ac56de8316c0eb1111824c9add045cac2bd7a2 upstream.
+
+Fixes the following build error when CONFIG_KEXEC is enabled:
+ CC arch/arm/mach-kirkwood/board-dt.o
+arch/arm/mach-kirkwood/board-dt.c: In function 'kirkwood_dt_init':
+arch/arm/mach-kirkwood/board-dt.c:52:2: error: 'kexec_reinit' undeclared (first use in this function)
+arch/arm/mach-kirkwood/board-dt.c:52:2: note: each undeclared identifier is reported only once for each function it appears in
+
+Signed-off-by: Ian Campbell <ijc at hellion.org.uk>
+[v4, rebase onto recent Linus for repost]
+[v3, speak actual English in the commit message, thanks Sergei Shtylyov]
+[v2, using linux/kexec.h not asm/kexec.h]
+Signed-off-by: Jason Cooper <jason at lakedaemon.net>
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 1c672d9..f7fe1b9 100644
More information about the Kernel-svn-changes
mailing list