Skip to contentSkip to conversation

Issue with arm-devel tree

DISCUSSION Russell King 2 participants 2 messages Jan 12, 2008 – Jan 14, 2008

lore
Share & tools
lore

Russell King

author Acked-by Lennert Buytenhek
#0 lore raw

It might be a good idea if there was some co-ordination with people involved in the duplicate include removal work...

[ARM] remove duplicate includes

@@ -20,7 +20,6 @@
#include <linux/module.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
-#include <linux/reboot.h>

#include <asm/mach-types.h>

[ARM] ixp4xx: remove double include

Remove double include.

@@ -18,7 +18,6 @@
*/

#include <linux/module.h>
-#include <linux/reboot.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/reboot.h>

I've dropped the "ixp4xx: remove double include" commit and fixed the resulting breakage of "remove duplicate includes" change to resolve this problem.

----- Forwarded message from Michael-Luke Jones <[email protected]> -----

To: [email protected]
From: Michael-Luke Jones <[email protected]>
Subject: Issue with arm-devel tree
Date: Sat, 12 Jan 2008 14:23:44 +0000

http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/arm:devel.mbox

contains two patches:

"Re: [ARM] remove duplicate includes" from Lucas Woods <[email protected]>
"Re: [ARM] ixp4xx: remove double include" from Andre Haupt <[email protected]>

which between the two of them manage to delete *both* instances of #include <linux/reboot.h> in nslu2-power.c

Given that nslu2-power.c calls machine_power_off() and ctrl_alt_del() this probably isn't a good thing.

Michael-Luke Jones

----- End forwarded message -----

Signature · 1 line
Russell King
#1 lore raw
Quoted 2 lines · Russell King

It might be a good idea if there was some co-ordination with people involved in the duplicate include removal work...

Sorry for the inconvenience! I did not realise that Lucas was working on this and hence missed his patches.

Best regards,

Andre