From da2c83559250fcc2321f11018198b4ea031da9a7 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 29 Dec 2010 04:26:17 +0000 Subject: [PATCH] --- yaml --- r: 223765 b: refs/heads/master c: f4d5900a99dbc354ef1ba384d445ff80ae4d77b4 h: refs/heads/master i: 223763: 9df11bc2364d0f92c52257b80ff025a82018a09e v: v3 --- [refs] | 2 +- trunk/drivers/net/starfire.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 42b2d656d2e7..35c7fc40f3fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 824f5f38d3005c346a043dedcfe8b048b699b81a +refs/heads/master: f4d5900a99dbc354ef1ba384d445ff80ae4d77b4 diff --git a/trunk/drivers/net/starfire.c b/trunk/drivers/net/starfire.c index 4adf12422787..a4f2bd52e546 100644 --- a/trunk/drivers/net/starfire.c +++ b/trunk/drivers/net/starfire.c @@ -148,7 +148,7 @@ static int full_duplex[MAX_UNITS] = {0, }; * This SUCKS. * We need a much better method to determine if dma_addr_t is 64-bit. */ -#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)) +#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || (defined(CONFIG_MIPS) && ((defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || defined(CONFIG_64BIT))) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)) /* 64-bit dma_addr_t */ #define ADDR_64BITS /* This chip uses 64 bit addresses. */ #define netdrv_addr_t __le64