diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /arch/sh/drivers/pci/pci-sh4.h | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh4.h')
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci-sh4.h b/arch/sh/drivers/pci/pci-sh4.h index 4925c79ea959..07e29506080f 100644 --- 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 { | |||
| 172 | 172 | ||
| 173 | static inline void pci_write_reg(unsigned long val, unsigned long reg) | 173 | static inline void pci_write_reg(unsigned long val, unsigned long reg) |
| 174 | { | 174 | { |
| 175 | outl(val, PCI_REG(reg)); | 175 | ctrl_outl(val, PCI_REG(reg)); |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | static inline unsigned long pci_read_reg(unsigned long reg) | 178 | static inline unsigned long pci_read_reg(unsigned long reg) |
| 179 | { | 179 | { |
| 180 | return inl(PCI_REG(reg)); | 180 | return ctrl_inl(PCI_REG(reg)); |
| 181 | } | 181 | } |
| 182 | #endif /* __PCI_SH4_H */ | 182 | #endif /* __PCI_SH4_H */ |