From 258386223ffda37cb017c724faea668e28c60da5 Mon Sep 17 00:00:00 2001 From: Michal Piotrowski Date: Mon, 25 Sep 2006 16:39:21 -0700 Subject: [PATCH] --- yaml --- r: 36494 b: refs/heads/master c: 0fe2480aded9504434e24815c410cbebb4f4efad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/typhoon.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 83729f0ea372..4169b569f57e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8d9c9c876d3a2a109caa2c06b2761af0337c2f4 +refs/heads/master: 0fe2480aded9504434e24815c410cbebb4f4efad diff --git a/trunk/drivers/net/typhoon.c b/trunk/drivers/net/typhoon.c index 8f6f6fd8b87d..d5c32e9caa97 100644 --- a/trunk/drivers/net/typhoon.c +++ b/trunk/drivers/net/typhoon.c @@ -333,11 +333,7 @@ enum state_values { #define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY) #define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY) -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28) -#define typhoon_synchronize_irq(x) synchronize_irq() -#else #define typhoon_synchronize_irq(x) synchronize_irq(x) -#endif #if defined(NETIF_F_TSO) #define skb_tso_size(x) (skb_shinfo(x)->gso_size)