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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
pci_fire.c
diff --git
a/arch/sparc/kernel/pci_fire.c
b/arch/sparc/kernel/pci_fire.c
index
d53f45b
..
51cfa09
100644
(file)
--- a/
arch/sparc/kernel/pci_fire.c
+++ b/
arch/sparc/kernel/pci_fire.c
@@
-413,7
+413,7
@@
static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,
struct of_device *op, u32 portid)
{
const struct linux_prom64_registers *regs;
struct of_device *op, u32 portid)
{
const struct linux_prom64_registers *regs;
- struct device_node *dp = op->node;
+ struct device_node *dp = op->
dev.of_
node;
int err;
pbm->numa_node = -1;
int err;
pbm->numa_node = -1;
@@
-458,7
+458,7
@@
static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,
static int __devinit fire_probe(struct of_device *op,
const struct of_device_id *match)
{
static int __devinit fire_probe(struct of_device *op,
const struct of_device_id *match)
{
- struct device_node *dp = op->node;
+ struct device_node *dp = op->
dev.of_
node;
struct pci_pbm_info *pbm;
struct iommu *iommu;
u32 portid;
struct pci_pbm_info *pbm;
struct iommu *iommu;
u32 portid;
@@
-508,8
+508,11
@@
static struct of_device_id __initdata fire_match[] = {
};
static struct of_platform_driver fire_driver = {
};
static struct of_platform_driver fire_driver = {
- .name = DRIVER_NAME,
- .match_table = fire_match,
+ .driver = {
+ .name = DRIVER_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = fire_match,
+ },
.probe = fire_probe,
};
.probe = fire_probe,
};