diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
| commit | 89034bc2c7b839702c00a704e79d112737f98be0 (patch) | |
| tree | e65b1f3d4c751baa840efc81bc4734f089379eb3 /drivers/parisc/dino.c | |
| parent | fb82ad719831db58e9baa4c67015aae3fe27e7e3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/parisc/dino.c')
| -rw-r--r-- | drivers/parisc/dino.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index c590974e9815..d69bde6a2343 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
| @@ -614,7 +614,7 @@ dino_fixup_bus(struct pci_bus *bus) | |||
| 614 | dev_name(&bus->self->dev), i, | 614 | dev_name(&bus->self->dev), i, |
| 615 | bus->self->resource[i].start, | 615 | bus->self->resource[i].start, |
| 616 | bus->self->resource[i].end); | 616 | bus->self->resource[i].end); |
| 617 | pci_assign_resource(bus->self, i); | 617 | WARN_ON(pci_assign_resource(bus->self, i)); |
| 618 | DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n", | 618 | DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n", |
| 619 | dev_name(&bus->self->dev), i, | 619 | dev_name(&bus->self->dev), i, |
| 620 | bus->self->resource[i].start, | 620 | bus->self->resource[i].start, |