Merge git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-fix-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / drivers / pci / pci-sh4.h

diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h
index 4925c79ea9594068aba7f517ede6cc213921d353..07e29506080f4c2f27e69abfe932cbe45e5de292 100644 (file)
--- a/arch/sh/drivers/pci/pci-sh4.h
+++ b/arch/sh/drivers/pci/pci-sh4.h
@@ -172,11 +172,11 @@ struct sh4_pci_address_map {
 
 static inline void pci_write_reg(unsigned long val, unsigned long reg)
 {
-       outl(val, PCI_REG(reg));
+       ctrl_outl(val, PCI_REG(reg));
 }
 
 static inline unsigned long pci_read_reg(unsigned long reg)
 {
-       return inl(PCI_REG(reg));
+       return ctrl_inl(PCI_REG(reg));
 }
 #endif /* __PCI_SH4_H */