Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-microblaze.git] / drivers / net / arcnet / com90xx.c

diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c
index 43150b2..0d45553 100644 (file)
--- a/drivers/net/arcnet/com90xx.c
+++ b/drivers/net/arcnet/com90xx.c
@@ -125,11 +125,11 @@ static void __init com90xx_probe(void)
        if (!io && !irq && !shmem && !*device && com90xx_skip_probe)
                return;
 
-       shmems = kzalloc(((0x10000-0xa0000) / 0x800) * sizeof(unsigned long),
+       shmems = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(unsigned long),
                         GFP_KERNEL);
        if (!shmems)
                return;
-       iomem = kzalloc(((0x10000-0xa0000) / 0x800) * sizeof(void __iomem *),
+       iomem = kzalloc(((0x100000-0xa0000) / 0x800) * sizeof(void __iomem *),
                         GFP_KERNEL);
        if (!iomem) {
                kfree(shmems);