Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / include / asm-powerpc / pci-bridge.h

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 4f55573762bb8ecefe7fca89a4f2488b3eea5c5c..7bb7f90098066f81d3ec216141c21294c26ea2ea 100644 (file)
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -6,7 +6,6 @@
 #include <asm-ppc/pci-bridge.h>
 #else
 
-#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/list.h>
 
@@ -26,6 +25,7 @@ struct pci_controller {
        int node;
        void *arch_data;
        struct list_head list_node;
+       struct device *parent;
 
        int first_busno;
        int last_busno;