|
@@ -101,6 +101,7 @@ static void __init mark_region(unsigned long start, unsigned long end,
|
|
end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START;
|
|
end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START;
|
|
while (start < end) {
|
|
while (start < end) {
|
|
u32 chunk = start>>Z2RAM_CHUNKSHIFT;
|
|
u32 chunk = start>>Z2RAM_CHUNKSHIFT;
|
|
|
|
+
|
|
if (flag)
|
|
if (flag)
|
|
set_bit(chunk, zorro_unused_z2ram);
|
|
set_bit(chunk, zorro_unused_z2ram);
|
|
else
|
|
else
|
|
@@ -117,6 +118,7 @@ static struct resource __init *zorro_find_parent_resource(
|
|
|
|
|
|
for (i = 0; i < bridge->num_resources; i++) {
|
|
for (i = 0; i < bridge->num_resources; i++) {
|
|
struct resource *r = &bridge->resource[i];
|
|
struct resource *r = &bridge->resource[i];
|
|
|
|
+
|
|
if (zorro_resource_start(z) >= r->start &&
|
|
if (zorro_resource_start(z) >= r->start &&
|
|
zorro_resource_end(z) <= r->end)
|
|
zorro_resource_end(z) <= r->end)
|
|
return r;
|
|
return r;
|
|
@@ -168,6 +170,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
|
|
if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
|
|
if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
|
|
/* GVP quirk */
|
|
/* GVP quirk */
|
|
unsigned long magic = zi->boardaddr + 0x8000;
|
|
unsigned long magic = zi->boardaddr + 0x8000;
|
|
|
|
+
|
|
z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
|
|
z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
|
|
}
|
|
}
|
|
z->slotaddr = zi->slotaddr;
|
|
z->slotaddr = zi->slotaddr;
|