git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ACPI] fix "nolapic" flag in ACPI mode
[pandora-kernel.git]
/
arch
/
ppc
/
platforms
/
chrp_pci.c
diff --git
a/arch/ppc/platforms/chrp_pci.c
b/arch/ppc/platforms/chrp_pci.c
index
7d3fbb5
..
c7fe618
100644
(file)
--- a/
arch/ppc/platforms/chrp_pci.c
+++ b/
arch/ppc/platforms/chrp_pci.c
@@
-29,7
+29,7
@@
void __iomem *gg2_pci_config_base;
* limit the bus number to 3 bits
*/
* limit the bus number to 3 bits
*/
-int
__chrp
gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off,
+int gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off,
int len, u32 *val)
{
volatile void __iomem *cfg_data;
int len, u32 *val)
{
volatile void __iomem *cfg_data;
@@
-56,7
+56,7
@@
int __chrp gg2_read_config(struct pci_bus *bus, unsigned int devfn, int off,
return PCIBIOS_SUCCESSFUL;
}
return PCIBIOS_SUCCESSFUL;
}
-int
__chrp
gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,
+int gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,
int len, u32 val)
{
volatile void __iomem *cfg_data;
int len, u32 val)
{
volatile void __iomem *cfg_data;
@@
-92,7
+92,7
@@
static struct pci_ops gg2_pci_ops =
/*
* Access functions for PCI config space using RTAS calls.
*/
/*
* Access functions for PCI config space using RTAS calls.
*/
-int
__chrp
+int
rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
int len, u32 *val)
{
rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
int len, u32 *val)
{
@@
-108,7
+108,7
@@
rtas_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
return rval? PCIBIOS_DEVICE_NOT_FOUND: PCIBIOS_SUCCESSFUL;
}
return rval? PCIBIOS_DEVICE_NOT_FOUND: PCIBIOS_SUCCESSFUL;
}
-int
__chrp
+int
rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
int len, u32 val)
{
rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
int len, u32 val)
{
@@
-203,7
+203,7
@@
static void __init setup_peg2(struct pci_controller *hose, struct device_node *d
printk ("RTAS supporting Pegasos OF not found, please upgrade"
" your firmware\n");
}
printk ("RTAS supporting Pegasos OF not found, please upgrade"
" your firmware\n");
}
- pci_assign_all_bus
s
es = 1;
+ pci_assign_all_buses = 1;
}
void __init
}
void __init
@@
-275,7
+275,7
@@
chrp_find_bridges(void)
setup_python(hose, dev);
} else if (is_mot
|| strncmp(model, "Motorola, Grackle", 17) == 0) {
setup_python(hose, dev);
} else if (is_mot
|| strncmp(model, "Motorola, Grackle", 17) == 0) {
- setup_
grackle(hose
);
+ setup_
indirect_pci(hose, 0xfec00000, 0xfee00000
);
} else if (is_longtrail) {
void __iomem *p = ioremap(GG2_PCI_CONFIG_BASE, 0x80000);
hose->ops = &gg2_pci_ops;
} else if (is_longtrail) {
void __iomem *p = ioremap(GG2_PCI_CONFIG_BASE, 0x80000);
hose->ops = &gg2_pci_ops;