diff options
author | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
commit | 46b2835771ad8ef19b8e081e8c90439408c7645f (patch) | |
tree | 4059e1949df40d6c9078bcbe6783b03384ba61f3 /arch/powerpc/sysdev/indirect_pci.c | |
parent | 9d78592ed72dbff1d8825207f8def07858a49768 (diff) | |
parent | 141707892e92dca69b7b8af65b9367da2d1f8120 (diff) |
Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/sysdev/indirect_pci.c')
-rw-r--r-- | arch/powerpc/sysdev/indirect_pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c index a8ac2dfdd3d4..5294560c7b00 100644 --- a/arch/powerpc/sysdev/indirect_pci.c +++ b/arch/powerpc/sysdev/indirect_pci.c | |||
@@ -160,4 +160,5 @@ setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data, u32 | |||
160 | mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE); | 160 | mbase = ioremap(cfg_data & PAGE_MASK, PAGE_SIZE); |
161 | hose->cfg_data = mbase + (cfg_data & ~PAGE_MASK); | 161 | hose->cfg_data = mbase + (cfg_data & ~PAGE_MASK); |
162 | hose->ops = &indirect_pci_ops; | 162 | hose->ops = &indirect_pci_ops; |
163 | hose->indirect_type = flags; | ||
163 | } | 164 | } |