Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362307
b: refs/heads/master
c: aa8b4be
h: refs/heads/master
i:
  362305: 7a8e7a9
  362303: d59abd2
v: v3
  • Loading branch information
Jay Estabrook authored and Linus Torvalds committed Apr 7, 2013
1 parent c46d60b commit 78c64b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fe6969094214350e586d56fbfa3ef97cdd74b270
refs/heads/master: aa8b4be3ac049c8b1df2a87e4d1d902ccfc1f7a9
5 changes: 5 additions & 0 deletions trunk/arch/alpha/kernel/sys_nautilus.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr)
extern void free_reserved_mem(void *, void *);
extern void pcibios_claim_one_bus(struct pci_bus *);

static struct resource irongate_io = {
.name = "Irongate PCI IO",
.flags = IORESOURCE_IO,
};
static struct resource irongate_mem = {
.name = "Irongate PCI MEM",
.flags = IORESOURCE_MEM,
Expand All @@ -209,6 +213,7 @@ nautilus_init_pci(void)

irongate = pci_get_bus_and_slot(0, 0);
bus->self = irongate;
bus->resource[0] = &irongate_io;
bus->resource[1] = &irongate_mem;

pci_bus_size_bridges(bus);
Expand Down

0 comments on commit 78c64b0

Please sign in to comment.