diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-05-06 20:19:42 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-05-06 20:19:42 -0700 |
| commit | 9f2fec0f2dc6b89dd14ed7663377d02bc9c590ba (patch) | |
| tree | 91ae36288e72e6996f593b820e730eab07d91b90 | |
| parent | bbb283cca10b2d2c935ae35327620ebae07f7d80 (diff) | |
| parent | f9001d4262148fbfb7ecdcb88c73d9791c1ac0ad (diff) | |
merge
| -rw-r--r-- | arch/alpha/kernel/pci.c | 4 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 2 | ||||
| -rw-r--r-- | drivers/pci/pool.c | 1 | ||||
| -rw-r--r-- | drivers/pci/probe.c | 2 | ||||
| -rw-r--r-- | drivers/pci/proc.c | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index f7bb7c60b4a8..725ef7247123 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -192,7 +192,7 @@ pcibios_align_resource(void *data, struct resource *res, unsigned long size) #undef MB #undef GB -void __init +static void __init pcibios_init(void) { if (!alpha_mv.init_pci) @@ -200,6 +200,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 27e532c1ac1e..29a75e248bd7 100644 --- 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 700d2abbe278..dec050f4b0d5 100644 --- 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 00a357b366a4..f56278fbbbf9 100644 --- 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 aa3371c76d29..35b28e319384 100644 --- 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> |