Hi Jean,
Today's linux-next merge of the i2c tree got a conflict in
include/linux/pci_ids.h between commit 1b1937455d18 ("x86/PCI: irq and
pci_ids patch for Intel Panther Point DeviceIDs") from the pci tree and
commit 6f19955a79b6 ("i2c-i801: Move device ID definitions to driver")
from the i2c tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/pci_ids.h
index 52f4ed4,8abe8d7..0000000
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -2477,13 -2477,8 +2477,11 @@@
#define PCI_DEVICE_ID_INTEL_82840_HB 0x1a21
#define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30
#define PCI_DEVICE_ID_INTEL_IOAT 0x1a38
- #define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN 0x1c41
#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX 0x1c5f
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS 0x1e22
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN 0x1e40
+#define PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX 0x1e5f
- #define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS 0x1d22
#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_0 0x1d40
#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC_1 0x1d41
#define PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN 0x2310
Attachment:
pgpjqr5EvCOFf.pgp
Description: PGP signature
