summaryrefslogtreecommitdiff
path: root/arch/alpha
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-01-31 19:12:56 +0300
committerBjorn Helgaas <helgaas@kernel.org>2018-01-31 19:12:56 +0300
commit414ae7609e19580a56647344e61f13f3768e0820 (patch)
treef4a2e50f589d459406e5c1dae1cb06b8f4668b03 /arch/alpha
parent11377725da463951cd501f5cecce30af999ee338 (diff)
parenta9b94b74806b47348727aa3334a0541427e0061b (diff)
downloadlinux-414ae7609e19580a56647344e61f13f3768e0820.tar.xz
Merge branch 'pci/resource' into next
* pci/resource: PCI: tegra: Remove PCI_REASSIGN_ALL_BUS use on Tegra resource: Set type when reserving new regions resource: Set type of "reserve=" user-specified resources irqchip/i8259: Set I/O port resource types correctly powerpc: Set I/O port resource types correctly MIPS: Set I/O port resource types correctly vgacon: Set VGA struct resource types PCI: Use dev_info() rather than dev_err() for ROM validation PCI: Remove PCI_REASSIGN_ALL_RSRC use on arm and arm64 PCI: Remove sysfs resource mmap warning Conflicts: drivers/pci/rom.c
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/kernel/console.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c
index 8e9a41966881..5476279329a6 100644
--- a/arch/alpha/kernel/console.c
+++ b/arch/alpha/kernel/console.c
@@ -21,6 +21,7 @@
struct pci_controller *pci_vga_hose;
static struct resource alpha_vga = {
.name = "alpha-vga+",
+ .flags = IORESOURCE_IO,
.start = 0x3C0,
.end = 0x3DF
};