From 44514383667e2bdc1a498d92bfc5de6cf40f45c7 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 1 Apr 2011 05:27:51 +0000 Subject: [PATCH] --- yaml --- r: 243705 b: refs/heads/master c: 1591cb60838603c8cc2c540192c8244962436539 h: refs/heads/master i: 243703: 44238c88aed451e16efd88f05f869f4c270fe776 v: v3 --- [refs] | 2 +- trunk/drivers/net/starfire.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1282c06646da..eab21ac3aa53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e58e5283a0a0a99ee970e7e5c80c6541693376e +refs/heads/master: 1591cb60838603c8cc2c540192c8244962436539 diff --git a/trunk/drivers/net/starfire.c b/trunk/drivers/net/starfire.c index a4f2bd52e546..36045f3b0327 100644 --- a/trunk/drivers/net/starfire.c +++ b/trunk/drivers/net/starfire.c @@ -144,11 +144,7 @@ static int full_duplex[MAX_UNITS] = {0, }; /* Time in jiffies before concluding the transmitter is hung. */ #define TX_TIMEOUT (2 * HZ) -/* - * 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(CONFIG_MIPS) && ((defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || defined(CONFIG_64BIT))) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)) +#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT /* 64-bit dma_addr_t */ #define ADDR_64BITS /* This chip uses 64 bit addresses. */ #define netdrv_addr_t __le64