summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-03-28 23:46:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2022-03-28 23:46:53 +0200
commitb83d85a5c81c1f8227dc54636c779d3f20a4d731 (patch)
tree650dc536ff77a4a07355f46a243fd288a89284fd /arch/microblaze/include
parentMerge tag 'livepatching-for-5.18' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentmicroblaze/PCI: Remove pci_phys_mem_access_prot() dead code (diff)
downloadlinux-b83d85a5c81c1f8227dc54636c779d3f20a4d731.tar.xz
linux-b83d85a5c81c1f8227dc54636c779d3f20a4d731.zip
Merge tag 'microblaze-v5.18' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek: - Small fixups - Remove unused pci_phys_mem_access_prot() * tag 'microblaze-v5.18' of git://git.monstr.eu/linux-2.6-microblaze: microblaze/PCI: Remove pci_phys_mem_access_prot() dead code microblaze: add const to of_device_id microblaze: fix typo in a comment
Diffstat (limited to 'arch/microblaze/include')
-rw-r--r--arch/microblaze/include/asm/pci.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 7c4dc5d85f53..d90528064604 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -61,10 +61,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
extern void pcibios_resource_survey(void);
struct file;
-extern pgprot_t pci_phys_mem_access_prot(struct file *file,
- unsigned long pfn,
- unsigned long size,
- pgprot_t prot);
/* This part of code was originally in xilinx-pci.h */
#ifdef CONFIG_PCI_XILINX