diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/pci/hotplug/pciehprm_nonacpi.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/pci/hotplug/pciehprm_nonacpi.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehprm_nonacpi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehprm_nonacpi.c b/drivers/pci/hotplug/pciehprm_nonacpi.c index 3622965f8961..33b2c69a0829 100644 --- a/drivers/pci/hotplug/pciehprm_nonacpi.c +++ b/drivers/pci/hotplug/pciehprm_nonacpi.c | |||
| @@ -33,10 +33,13 @@ | |||
| 33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | |||
| 36 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
| 37 | #ifdef CONFIG_IA64 | 39 | #ifdef CONFIG_IA64 |
| 38 | #include <asm/iosapic.h> | 40 | #include <asm/iosapic.h> |
| 39 | #endif | 41 | #endif |
| 42 | |||
| 40 | #include "pciehp.h" | 43 | #include "pciehp.h" |
| 41 | #include "pciehprm.h" | 44 | #include "pciehprm.h" |
| 42 | #include "pciehprm_nonacpi.h" | 45 | #include "pciehprm_nonacpi.h" |