Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755235Ab1EKTna (ORCPT ); Wed, 11 May 2011 15:43:30 -0400 Received: from cantor.suse.de ([195.135.220.2]:59567 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754366Ab1EKTn3 (ORCPT ); Wed, 11 May 2011 15:43:29 -0400 Date: Wed, 11 May 2011 12:43:18 -0700 From: Greg KH To: "Kilau, Scott" Cc: "'mreed10@us.ibm.com'" , "'linux-kernel@vger.kernel.org'" , "'Alan Cox'" Subject: Re: [PATCH] 8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter Message-ID: <20110511194318.GA26704@suse.de> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 832 Lines: 22 On Wed, May 11, 2011 at 02:28:07PM -0500, Kilau, Scott wrote: > --- linux-2.6.38.6-vanilla/include/linux/pci_ids.h 2011-04-21 16:34:46.000000000 -0500 > +++ linux-2.6.38.6/include/linux/pci_ids.h 2011-04-27 14:56:30.000000000 -0500 > @@ -1476,6 +1476,7 @@ > #define PCI_DEVICE_ID_NEO_2RJ45 0x00CA > #define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB > #define PCIE_DEVICE_ID_NEO_4_IBM 0x00F4 > +#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6 Please see the top of this file for why you shouldn't be adding new device ids into it. Third time's a charm? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/