From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161382AbWKHRtD (ORCPT ); Wed, 8 Nov 2006 12:49:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161398AbWKHRtA (ORCPT ); Wed, 8 Nov 2006 12:49:00 -0500 Received: from mga02.intel.com ([134.134.136.20]:23858 "EHLO mga02.intel.com") by vger.kernel.org with ESMTP id S1161382AbWKHRs7 (ORCPT ); Wed, 8 Nov 2006 12:48:59 -0500 X-ExtLoop1: 1 X-IronPort-AV: i="4.09,401,1157353200"; d="scan'208"; a="158276899:sNHT23459324" Message-ID: <45521873.20402@intel.com> Date: Wed, 08 Nov 2006 09:48:35 -0800 From: Auke Kok User-Agent: Mail/News 1.5.0.7 (X11/20060918) MIME-Version: 1.0 To: Jeff Garzik CC: Andrew Morton , NetDev , Linux Kernel Mailing List , Jesse Brandeburg Subject: e1000: include for IA64 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 08 Nov 2006 17:48:36.0217 (UTC) FILETIME=[1D9FCE90:01C7035E] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Here's a slightly better patch to fix ia64 not building atm. Jeff, please apply this to netdev-2.6#upstream instead of akpm's patch that I acked earlier. Of course, someone really should come up with an asm version for ia64 of the missing function ;) Cheers, Auke --- e1000: include for IA64 IA64 does not have an optimized asm version for ipv6 csum magic. Fall back to generic implementation. Signed-off-by: Auke Kok diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index f091042..26e7506 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h @@ -61,6 +61,7 @@ #include #ifdef NETIF_F_TSO6 #include +#include #endif #include #include