diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 13:46:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 13:46:44 -0700 |
| commit | 1e24aaabdee9e07f19b09bd305ffc069b0b07371 (patch) | |
| tree | 316ad0f78053bbc39474a5ed42d7e023702e2a97 /arch/openrisc/include/asm/pgtable.h | |
| parent | 16da0961d3d5521f6541a422c5485ea4ddfe860b (diff) | |
| parent | f3b17320db25b4cdd50f0396b096644455357dac (diff) | |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC updates from Stafford Horne:
"Few small things for 5.4:
- Fixup ethoc ethernet device tree descriptors which were previously
broken, now ethernet works on FPGAs running OpenRISC!
- Switch ioremap to use uncached semantics - from Christoph Hellwig"
* tag 'for-linus' of git://github.com/openrisc/linux:
openrisc: map as uncached in ioremap
or1k: dts: Add ethoc device to SMP devicetree
or1k: dts: Fix ethoc network configuration in or1ksim devicetree
Diffstat (limited to 'arch/openrisc/include/asm/pgtable.h')
| -rw-r--r-- | arch/openrisc/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/include/asm/pgtable.h b/arch/openrisc/include/asm/pgtable.h index 497fd908a4c4..2fe9ff5b5d6f 100644 --- a/arch/openrisc/include/asm/pgtable.h +++ b/arch/openrisc/include/asm/pgtable.h @@ -97,7 +97,7 @@ extern void paging_init(void); /* Define some higher level generic page attributes. * * If you change _PAGE_CI definition be sure to change it in - * io.h for ioremap_nocache() too. + * io.h for ioremap() too. */ /* |