[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20130210183845.GC12760@nekote.pengutronix.de>
Date: Sun, 10 Feb 2013 19:38:45 +0100
From: Wolfram Sang <w.sang@...gutronix.de>
To: Jean Delvare <khali@...ux-fr.org>
Cc: James Ralston <james.d.ralston@...el.com>,
linux-i2c@...r.kernel.org, linux-doc@...r.kernel.org,
linux-kernel@...r.kernel.org, Seth Heasley <seth.heasley@...el.com>
Subject: Re: [PATCH 3/5] i2c-i801: Add Device IDs for Intel Wellsburg PCH
> Seth recently sent a patch adding IDs for the Avoton:
> http://marc.info/?l=linux-kernel&m=135959209218860&w=2
>
> Your patch conflicts with his. Please rebase on top of Seth's patch, so
> that both patches can be applied in sequence.
Yes, please.
> > --- a/drivers/i2c/busses/i2c-i801.c
> > +++ b/drivers/i2c/busses/i2c-i801.c
> > (...)
> > @@ -165,6 +166,7 @@
> > #define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330
> > #define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS 0x3b30
> > #define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22
> > +#define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS 0x8d22
> > #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS 0x9c22
>
> Please keep sorted by ID.
Hum? This table looks sorted by numbers to me, so OK.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists