diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/cpcihp_generic.c | 1 | ||||
-rw-r--r-- | drivers/pci/hotplug/cpcihp_zt5550.c | 1 | ||||
-rw-r--r-- | drivers/pci/hotplug/fakephp.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/ibmphp_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_pci.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehprm_nonacpi.c | 3 | ||||
-rw-r--r-- | drivers/pci/hotplug/rpadlpar_core.c | 3 | ||||
-rw-r--r-- | drivers/pci/hotplug/rpaphp_pci.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/rpaphp_slot.c | 3 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp.h | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchprm_nonacpi.c | 2 | ||||
-rw-r--r-- | drivers/pci/pci-driver.c | 2 | ||||
-rw-r--r-- | drivers/pci/pci.c | 1 | ||||
-rw-r--r-- | drivers/pci/pcie/portdrv_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 1 | ||||
-rw-r--r-- | drivers/pci/quirks.c | 4 | ||||
-rw-r--r-- | drivers/pci/rom.c | 1 |
17 files changed, 31 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c index a62a4345b466..2d4639d6841f 100644 --- a/drivers/pci/hotplug/cpcihp_generic.c +++ b/drivers/pci/hotplug/cpcihp_generic.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
40 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |
41 | #include <linux/pci.h> | 41 | #include <linux/pci.h> |
42 | #include <linux/string.h> | ||
42 | #include "cpci_hotplug.h" | 43 | #include "cpci_hotplug.h" |
43 | 44 | ||
44 | #define DRIVER_VERSION "0.1" | 45 | #define DRIVER_VERSION "0.1" |
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c index 790abadd816c..f7cb00da38df 100644 --- a/drivers/pci/hotplug/cpcihp_zt5550.c +++ b/drivers/pci/hotplug/cpcihp_zt5550.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
39 | #include <linux/signal.h> /* SA_SHIRQ */ | ||
39 | #include "cpci_hotplug.h" | 40 | #include "cpci_hotplug.h" |
40 | #include "cpcihp_zt5550.h" | 41 | #include "cpcihp_zt5550.h" |
41 | 42 | ||
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index 8e47fa66e25e..060d74775d7b 100644 --- a/drivers/pci/hotplug/fakephp.c +++ b/drivers/pci/hotplug/fakephp.c | |||
@@ -37,6 +37,8 @@ | |||
37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
40 | #include <linux/string.h> | ||
41 | #include <linux/slab.h> | ||
40 | #include "pci_hotplug.h" | 42 | #include "pci_hotplug.h" |
41 | #include "../pci.h" | 43 | #include "../pci.h" |
42 | 44 | ||
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index 0392e004258f..aabf1e70b528 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c | |||
@@ -1077,7 +1077,7 @@ static int enable_slot(struct hotplug_slot *hs) | |||
1077 | if (rc) { | 1077 | if (rc) { |
1078 | err("Adding this card exceeds the limitations of this bus.\n"); | 1078 | err("Adding this card exceeds the limitations of this bus.\n"); |
1079 | err("(i.e., >1 133MHz cards running on same bus, or " | 1079 | err("(i.e., >1 133MHz cards running on same bus, or " |
1080 | ">2 66 PCI cards running on same bus\n."); | 1080 | ">2 66 PCI cards running on same bus.\n"); |
1081 | err("Try hot-adding into another bus\n"); | 1081 | err("Try hot-adding into another bus\n"); |
1082 | rc = -EINVAL; | 1082 | rc = -EINVAL; |
1083 | goto error_nopower; | 1083 | goto error_nopower; |
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index 33b539b34f7e..ff17d8e07e94 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c | |||
@@ -113,7 +113,7 @@ int pciehp_unconfigure_device(struct pci_func* func) | |||
113 | */ | 113 | */ |
114 | int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) | 114 | int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) |
115 | { | 115 | { |
116 | #if defined(CONFIG_X86) && !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64) | 116 | #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_IO_APIC) |
117 | int rc; | 117 | int rc; |
118 | u16 temp_word; | 118 | u16 temp_word; |
119 | struct pci_dev fakedev; | 119 | struct pci_dev fakedev; |
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" |
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index ad1017da8656..fcb66b9a0e28 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c | |||
@@ -16,10 +16,13 @@ | |||
16 | */ | 16 | */ |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
19 | #include <linux/string.h> | ||
20 | |||
19 | #include <asm/pci-bridge.h> | 21 | #include <asm/pci-bridge.h> |
20 | #include <asm/semaphore.h> | 22 | #include <asm/semaphore.h> |
21 | #include <asm/rtas.h> | 23 | #include <asm/rtas.h> |
22 | #include <asm/vio.h> | 24 | #include <asm/vio.h> |
25 | |||
23 | #include "../pci.h" | 26 | #include "../pci.h" |
24 | #include "rpaphp.h" | 27 | #include "rpaphp.h" |
25 | #include "rpadlpar.h" | 28 | #include "rpadlpar.h" |
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c index 46c157d26a2f..f7c12d7dfcfc 100644 --- a/drivers/pci/hotplug/rpaphp_pci.c +++ b/drivers/pci/hotplug/rpaphp_pci.c | |||
@@ -23,11 +23,13 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
26 | #include <linux/string.h> | ||
27 | |||
26 | #include <asm/pci-bridge.h> | 28 | #include <asm/pci-bridge.h> |
27 | #include <asm/rtas.h> | 29 | #include <asm/rtas.h> |
28 | #include <asm/machdep.h> | 30 | #include <asm/machdep.h> |
29 | #include "../pci.h" /* for pci_add_new_bus */ | ||
30 | 31 | ||
32 | #include "../pci.h" /* for pci_add_new_bus */ | ||
31 | #include "rpaphp.h" | 33 | #include "rpaphp.h" |
32 | 34 | ||
33 | static struct pci_bus *find_bus_among_children(struct pci_bus *bus, | 35 | static struct pci_bus *find_bus_among_children(struct pci_bus *bus, |
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c index 0e8815495083..daa89ae57123 100644 --- a/drivers/pci/hotplug/rpaphp_slot.c +++ b/drivers/pci/hotplug/rpaphp_slot.c | |||
@@ -27,6 +27,9 @@ | |||
27 | #include <linux/kobject.h> | 27 | #include <linux/kobject.h> |
28 | #include <linux/sysfs.h> | 28 | #include <linux/sysfs.h> |
29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
30 | #include <linux/string.h> | ||
31 | #include <linux/slab.h> | ||
32 | |||
30 | #include <asm/rtas.h> | 33 | #include <asm/rtas.h> |
31 | #include "rpaphp.h" | 34 | #include "rpaphp.h" |
32 | 35 | ||
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index abe2cf411e68..08ad26a0cae7 100644 --- a/drivers/pci/hotplug/shpchp.h +++ b/drivers/pci/hotplug/shpchp.h | |||
@@ -32,6 +32,8 @@ | |||
32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
35 | #include <linux/sched.h> /* signal_pending(), struct timer_list */ | ||
36 | |||
35 | #include "pci_hotplug.h" | 37 | #include "pci_hotplug.h" |
36 | 38 | ||
37 | #if !defined(MODULE) | 39 | #if !defined(MODULE) |
diff --git a/drivers/pci/hotplug/shpchprm_nonacpi.c b/drivers/pci/hotplug/shpchprm_nonacpi.c index d70fe5408417..c6b40998eeb3 100644 --- a/drivers/pci/hotplug/shpchprm_nonacpi.c +++ b/drivers/pci/hotplug/shpchprm_nonacpi.c | |||
@@ -32,6 +32,8 @@ | |||
32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
35 | #include <linux/slab.h> | ||
36 | |||
35 | #include "shpchp.h" | 37 | #include "shpchp.h" |
36 | 38 | ||
37 | int shpchprm_get_physical_slot_number(struct controller *ctrl, u32 *sun, u8 busnum, u8 devnum) | 39 | int shpchprm_get_physical_slot_number(struct controller *ctrl, u32 *sun, u8 busnum, u8 devnum) |
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 8972e6a3aac0..ae986e590b48 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -8,6 +8,8 @@ | |||
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | #include <linux/device.h> | 9 | #include <linux/device.h> |
10 | #include <linux/mempolicy.h> | 10 | #include <linux/mempolicy.h> |
11 | #include <linux/string.h> | ||
12 | #include <linux/slab.h> | ||
11 | #include "pci.h" | 13 | #include "pci.h" |
12 | 14 | ||
13 | /* | 15 | /* |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 61b855c99e39..e74d75843047 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
18 | #include <linux/string.h> | ||
18 | #include <asm/dma.h> /* isa_dma_bridge_buggy */ | 19 | #include <asm/dma.h> /* isa_dma_bridge_buggy */ |
19 | #include "pci.h" | 20 | #include "pci.h" |
20 | 21 | ||
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index 14f05d22bb70..467a4ceccf10 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c | |||
@@ -11,6 +11,8 @@ | |||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
13 | #include <linux/pm.h> | 13 | #include <linux/pm.h> |
14 | #include <linux/string.h> | ||
15 | #include <linux/slab.h> | ||
14 | #include <linux/pcieport_if.h> | 16 | #include <linux/pcieport_if.h> |
15 | 17 | ||
16 | #include "portdrv.h" | 18 | #include "portdrv.h" |
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 3c565ce7f77b..02260141dc81 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
13 | #include <linux/pm.h> | 13 | #include <linux/pm.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/slab.h> | ||
15 | #include <linux/pcieport_if.h> | 16 | #include <linux/pcieport_if.h> |
16 | 17 | ||
17 | #include "portdrv.h" | 18 | #include "portdrv.h" |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index bbd9c2323d8c..5627ce1d2b32 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
@@ -356,7 +356,7 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int | |||
356 | /* | 356 | /* |
357 | * PIIX4 ACPI: Two IO regions pointed to by longwords at | 357 | * PIIX4 ACPI: Two IO regions pointed to by longwords at |
358 | * 0x40 (64 bytes of ACPI registers) | 358 | * 0x40 (64 bytes of ACPI registers) |
359 | * 0x90 (32 bytes of SMB registers) | 359 | * 0x90 (16 bytes of SMB registers) |
360 | * and a few strange programmable PIIX4 device resources. | 360 | * and a few strange programmable PIIX4 device resources. |
361 | */ | 361 | */ |
362 | static void __devinit quirk_piix4_acpi(struct pci_dev *dev) | 362 | static void __devinit quirk_piix4_acpi(struct pci_dev *dev) |
@@ -366,7 +366,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev) | |||
366 | pci_read_config_dword(dev, 0x40, ®ion); | 366 | pci_read_config_dword(dev, 0x40, ®ion); |
367 | quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES, "PIIX4 ACPI"); | 367 | quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES, "PIIX4 ACPI"); |
368 | pci_read_config_dword(dev, 0x90, ®ion); | 368 | pci_read_config_dword(dev, 0x90, ®ion); |
369 | quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB"); | 369 | quirk_io_region(dev, region, 16, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB"); |
370 | 370 | ||
371 | /* Device resource A has enables for some of the other ones */ | 371 | /* Device resource A has enables for some of the other ones */ |
372 | pci_read_config_dword(dev, 0x5c, &res_a); | 372 | pci_read_config_dword(dev, 0x5c, &res_a); |
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index 49bd21702314..598a115cd00e 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/config.h> | 9 | #include <linux/config.h> |
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
12 | #include <linux/slab.h> | ||
12 | 13 | ||
13 | #include "pci.h" | 14 | #include "pci.h" |
14 | 15 | ||