diff options
| author |   Jacob <jacobenders1@gmail.com> | 2018-05-12 23:11:40 -0400 |
|---|---|---|
| committer |   Geert Uytterhoeven <geert@linux-m68k.org> | 2018-05-22 10:31:51 +0200 |
| commit | d49cbe73beb7ff51cb09aeb8b1b1347d2e08438a (patch) | |
| tree | 86cc0cbca689f6c7a7cf43a394c9b40a78b8cb29 /drivers/zorro | |
| parent | m68k: Use read_persistent_clock64() consistently (diff) | |
| download | linux-dev-d49cbe73beb7ff51cb09aeb8b1b1347d2e08438a.tar.xz linux-dev-d49cbe73beb7ff51cb09aeb8b1b1347d2e08438a.zip | |
zorro: Add a blank line after declarations
Fixes a coding style issue.
Signed-off-by: Jacob Enders <jacobenders1@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/zorro.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 47728477297e..67fa900572a9 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c @@ -101,6 +101,7 @@ static void __init mark_region(unsigned long start, unsigned long end, end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START; while (start < end) { u32 chunk = start>>Z2RAM_CHUNKSHIFT; + if (flag) set_bit(chunk, zorro_unused_z2ram); else @@ -117,6 +118,7 @@ static struct resource __init *zorro_find_parent_resource( for (i = 0; i < bridge->num_resources; i++) { struct resource *r = &bridge->resource[i]; + if (zorro_resource_start(z) >= r->start && zorro_resource_end(z) <= r->end) return r; @@ -168,6 +170,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) if (z->id == ZORRO_PROD_GVP_EPC_BASE) { /* GVP quirk */ unsigned long magic = zi->boardaddr + 0x8000; + z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK; } z->slotaddr = zi->slotaddr; |