git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
pci
/
pci-acpi.c
diff --git
a/drivers/pci/pci-acpi.c
b/drivers/pci/pci-acpi.c
index
bb7456c
..
c2ecae5
100644
(file)
--- a/
drivers/pci/pci-acpi.c
+++ b/
drivers/pci/pci-acpi.c
@@
-267,7
+267,7
@@
static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
/* ACPI bus type */
/* ACPI bus type */
-static int
acpi_pc
i_find_device(struct device *dev, acpi_handle *handle)
+static int
pci_acp
i_find_device(struct device *dev, acpi_handle *handle)
{
struct pci_dev * pci_dev;
acpi_integer addr;
{
struct pci_dev * pci_dev;
acpi_integer addr;
@@
-281,7
+281,7
@@
static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
return 0;
}
return 0;
}
-static int
acpi_pc
i_find_root_bridge(struct device *dev, acpi_handle *handle)
+static int
pci_acp
i_find_root_bridge(struct device *dev, acpi_handle *handle)
{
int num;
unsigned int seg, bus;
{
int num;
unsigned int seg, bus;
@@
-299,21
+299,21
@@
static int acpi_pci_find_root_bridge(struct device *dev, acpi_handle *handle)
return 0;
}
return 0;
}
-static struct acpi_bus_type
acpi_pc
i_bus = {
+static struct acpi_bus_type
pci_acp
i_bus = {
.bus = &pci_bus_type,
.bus = &pci_bus_type,
- .find_device =
acpi_pc
i_find_device,
- .find_bridge =
acpi_pc
i_find_root_bridge,
+ .find_device =
pci_acp
i_find_device,
+ .find_bridge =
pci_acp
i_find_root_bridge,
};
};
-static int __init
acpi_pc
i_init(void)
+static int __init
pci_acp
i_init(void)
{
int ret;
{
int ret;
- ret = register_acpi_bus_type(&
acpi_pc
i_bus);
+ ret = register_acpi_bus_type(&
pci_acp
i_bus);
if (ret)
return 0;
platform_pci_choose_state = acpi_pci_choose_state;
platform_pci_set_power_state = acpi_pci_set_power_state;
return 0;
}
if (ret)
return 0;
platform_pci_choose_state = acpi_pci_choose_state;
platform_pci_set_power_state = acpi_pci_set_power_state;
return 0;
}
-arch_initcall(
acpi_pc
i_init);
+arch_initcall(
pci_acp
i_init);