[PATCH] fixes for PCI reorg changes

There are missing #includes which will break compilation on some non-x86
platforms. With following patch this compiles and works on alpha.

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 3f5ba3b07652e0a8a23ab10a01f795c2cd7c3474..517d573d818c1f597f04af0c9615f433c6989b30 100644 (file)
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -193,7 +193,7 @@ pcibios_align_resource(void *data, struct resource *res,
 #undef MB
 #undef GB
 
-void __init
+static void __init
 pcibios_init(void)
 {
        if (!alpha_mv.init_pci)
@@ -201,6 +201,8 @@ pcibios_init(void)
        alpha_mv.init_pci();
 }
 
+subsys_initcall(pcibios_init);
+
 char * __init
 pcibios_setup(char *str)
 {

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 27e532c1ac1e3a98f5c46e89dfec82a1ecce6867..29a75e248bd74d7be46a34278107a833db7685fe 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -9,6 +9,8 @@
  *     Copyright 1997 -- 2000 Martin Mares <mj@ucw.cz>
  */
 
+#include <linux/delay.h>
+#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>

diff --git a/drivers/pci/pool.c b/drivers/pci/pool.c
index 700d2abbe278b0f3a40a3ccefd6bd8fcf2009f38..dec050f4b0d5cf94b0e61acb6502b9d0c91aeeda 100644 (file)
--- a/drivers/pci/pool.c
+++ b/drivers/pci/pool.c
@@ -1,4 +1,5 @@
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 
 /*

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 00a357b366a43f1df0ac7640e89760deb29583e2..f56278fbbbf9b6400bcab2c02dfcdbac6f93d669 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2,7 +2,9 @@
  * probe.c - PCI detection and setup code
  */
 
+#include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 
 #undef DEBUG

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index aa3371c76d29881861e425055e0920e6700e244a..35b28e319384ea823504bbab6040952eced1f760 100644 (file)
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -6,6 +6,7 @@
  *     Copyright (c) 1997--1999 Martin Mares <mj@ucw.cz>
  */
 
+#include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>