diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-01 21:35:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-01 22:19:54 -0400 |
| commit | 3e502e63586920f219ed2590f69c1f5a8888cfa4 (patch) | |
| tree | 3a34c99398a37cad067a8f350c48a9d8f0c2a0b6 /drivers | |
| parent | 0705c6f0e2d39333645bf77cf1efb94526ff1f82 (diff) | |
starfire: Temporary kludge to fix powerpc build.
Add a dma_addr_t 64-bit case for powerpc with 64-bit phys addresses.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/starfire.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index c3bf288aaf25..4adf12422787 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
| @@ -148,7 +148,7 @@ static int full_duplex[MAX_UNITS] = {0, }; | |||
| 148 | * This SUCKS. | 148 | * This SUCKS. |
| 149 | * We need a much better method to determine if dma_addr_t is 64-bit. | 149 | * We need a much better method to determine if dma_addr_t is 64-bit. |
| 150 | */ | 150 | */ |
| 151 | #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)) | 151 | #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)) |
| 152 | /* 64-bit dma_addr_t */ | 152 | /* 64-bit dma_addr_t */ |
| 153 | #define ADDR_64BITS /* This chip uses 64 bit addresses. */ | 153 | #define ADDR_64BITS /* This chip uses 64 bit addresses. */ |
| 154 | #define netdrv_addr_t __le64 | 154 | #define netdrv_addr_t __le64 |