lkml.org 
[lkml]   [2008]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectFwd: Issue with arm-devel tree
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

Signed-off-by: Lucas Woods <woodzy@gmail.com>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

@@ -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.

Signed-off-by: Andre Haupt <andre@bitwigglers.org>
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

@@ -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 <jonesml@fastmail.to> -----
To: rmk@arm.linux.org.uk
From: Michael-Luke Jones <jonesml@fastmail.to>
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
<woodzy@gmail.com>
"Re: [ARM] ixp4xx: remove double include" from Andre Haupt
<andre@bitwigglers.org>

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 -----
--
Russell King


\
 
 \ /
  Last update: 2008-01-12 15:57    [from the cache]
©2003-2011 Jasper Spaans