diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-23 08:21:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-23 08:21:37 +0100 |
| commit | 03c1136af504bbc2cabda76af6b27fd5f7cf8a7d (patch) | |
| tree | 6c53a0f635b4339571050006191a950e3f5db93c /include/linux/pgtable.h | |
| parent | 0d79a48440f559ac939d1be2089757c5e4ab16c7 (diff) | |
| parent | 418baf2c28f3473039f2f7377760bd8f6897ae18 (diff) | |
| download | cachepc-linux-03c1136af504bbc2cabda76af6b27fd5f7cf8a7d.tar.gz cachepc-linux-03c1136af504bbc2cabda76af6b27fd5f7cf8a7d.zip | |
Merge 5.10-rc5 into staging-testing
We want the staging/IIO fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/pgtable.h')
| -rw-r--r-- | include/linux/pgtable.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 38c33eabea89..71125a4676c4 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1427,10 +1427,6 @@ typedef unsigned int pgtbl_mod_mask; #endif /* !__ASSEMBLY__ */ -#ifndef io_remap_pfn_range -#define io_remap_pfn_range remap_pfn_range -#endif - #ifndef has_transparent_hugepage #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define has_transparent_hugepage() 1 |