diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 20:37:09 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 20:37:09 +0300 |
commit | 164f59000c19fa1ee5d09327a8055ec9f9b9905a (patch) | |
tree | c613bd29f5489ebbd85a767fe789332983976d66 /arch/microblaze/configs/mmu_defconfig | |
parent | 7d62159919c90fbcd9ee808e9f1b776eae990d53 (diff) | |
parent | 5cfe469c2654c3a4dda8504b1209abdd8b379e95 (diff) | |
download | linux-164f59000c19fa1ee5d09327a8055ec9f9b9905a.tar.xz |
Merge tag 'microblaze-v6.2' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
"Clean up PCI support which was pretty much copied and pasted from
PowerPC long time ago for one custom platform which is not available
for years.
Also, the Xilinx/AMD PCIe team tested Microblaze with IP cores also
used on ARM SOCs and clean up Microblaze code"
* tag 'microblaze-v6.2' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze/PCI: Moving PCI iounmap and dependent code
microblaze/PCI: Remove support for Xilinx PCI host bridge
microblaze/PCI: Remove unused pci_iobar_pfn() and et al declarations
microblaze/PCI: Remove unused sys_pciconfig_iobase() and et al declaration
microblaze/PCI: Remove unused pci_address_to_pio() conversion of CPU address to I/O port
microblaze/PCI: Remove unused PCI Indirect ops
microblaze/PCI: Remove unused PCI BIOS resource allocation
microblaze/PCI: Remove unused allocation & free of PCI host bridge structure
microblaze/PCI: Remove unused device tree parsing for a host bridge resources
microblaze/PCI: Remove unused PCI legacy IO's access on a bus
microblaze/PCI: Remove unused PCI bus scan if configured as a host
microblaze/PCI: Remove Null PCI config access unused functions
microblaze/PCI: Remove unused early_read_config_byte() et al declarations
Diffstat (limited to 'arch/microblaze/configs/mmu_defconfig')
-rw-r--r-- | arch/microblaze/configs/mmu_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/microblaze/configs/mmu_defconfig b/arch/microblaze/configs/mmu_defconfig index 8150daf04a76..756feb9369a6 100644 --- a/arch/microblaze/configs/mmu_defconfig +++ b/arch/microblaze/configs/mmu_defconfig @@ -19,7 +19,6 @@ CONFIG_HZ_100=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE_FORCE=y CONFIG_HIGHMEM=y -CONFIG_PCI_XILINX=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set |