From: David Woodhouse <dwmw2@infradead.org>
Date: Sat, 6 May 2006 18:59:18 +0000 (+0100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.18-rc1~1103^2~7
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=5047f09b56d0bc3c21aec9cb16de60283da645c6;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

5047f09b56d0bc3c21aec9cb16de60283da645c6
diff --cc include/asm-arm/bug.h
index 0e36fd5d87d,5ab8216f520..7fb02138f58
--- a/include/asm-arm/bug.h
+++ b/include/asm-arm/bug.h
@@@ -1,6 -1,8 +1,7 @@@
  #ifndef _ASMARM_BUG_H
  #define _ASMARM_BUG_H
  
+ #include <linux/config.h>
 -#include <linux/stddef.h>
  
  #ifdef CONFIG_BUG
  #ifdef CONFIG_DEBUG_BUGVERBOSE
diff --cc include/asm-powerpc/topology.h
index 4cf340ccb4c,87362a05542..19c575f3916
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@@ -2,7 -2,11 +2,10 @@@
  #define _ASM_POWERPC_TOPOLOGY_H
  #ifdef __KERNEL__
  
 -#include <linux/config.h>
  
+ struct sys_device;
+ struct device_node;
+ 
  #ifdef CONFIG_NUMA
  
  #include <asm/mmzone.h>