diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-10 15:29:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-07-10 15:29:56 +1000 |
| commit | 4f8c463dc597df00e307b7f29c6d0c7731ba99d2 (patch) | |
| tree | 0c7ea03d7e545227cd6749826ee09797f9721394 /arch/ia64/sn/pci/tioce_provider.c | |
| parent | a7723ef3947464f5b82b3ee03f0aedcc08c8db0f (diff) | |
| parent | 70614261b64f970aef0f3e8cae5bc5d70a1a0f8f (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/ia64/sn/pci/tioce_provider.c')
| -rw-r--r-- | arch/ia64/sn/pci/tioce_provider.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/sn/pci/tioce_provider.c b/arch/ia64/sn/pci/tioce_provider.c index 46d3df4b03a1..3bd9abc35485 100644 --- a/arch/ia64/sn/pci/tioce_provider.c +++ b/arch/ia64/sn/pci/tioce_provider.c @@ -52,7 +52,7 @@ * All registers defined in struct tioce will meet that criteria. */ -static void inline +static inline void tioce_mmr_war_pre(struct tioce_kernel *kern, void __iomem *mmr_addr) { u64 mmr_base; @@ -78,7 +78,7 @@ tioce_mmr_war_pre(struct tioce_kernel *kern, void __iomem *mmr_addr) } } -static void inline +static inline void tioce_mmr_war_post(struct tioce_kernel *kern, void __iomem *mmr_addr) { u64 mmr_base; |