diff --git a/kernel/busses/i2c-i801.c b/kernel/busses/i2c-i801.c
index ceae14ad..ebefbf2d 100644
--- a/kernel/busses/i2c-i801.c
+++ b/kernel/busses/i2c-i801.c
@@ -57,12 +57,27 @@
 
 /* 82801CA is undefined before kernel 2.4.13 */
 #ifndef PCI_DEVICE_ID_INTEL_82801CA_3
-#define PCI_DEVICE_ID_INTEL_82801CA_3      0x2483
+#define PCI_DEVICE_ID_INTEL_82801CA_3	0x2483
 #endif
 
 /* 82801DB is undefined before kernel 2.4.19 */
 #ifndef PCI_DEVICE_ID_INTEL_82801DB_3
-#define PCI_DEVICE_ID_INTEL_82801DB_3      0x24c3
+#define PCI_DEVICE_ID_INTEL_82801DB_3	0x24c3
+#endif
+
+/* 82801EB is undefined before kernel 2.4.21 */
+#ifndef PCI_DEVICE_ID_INTEL_82801EB_3
+#define PCI_DEVICE_ID_INTEL_82801EB_3	0x24d3
+#endif
+
+/* ESB is undefined before kernel 2.4.22 */
+#ifndef PCI_DEVICE_ID_INTEL_ESB_4
+#define PCI_DEVICE_ID_INTEL_ESB_4	0x25a4
+#endif
+
+/* ICH6 is undefined */
+#ifndef PCI_DEVICE_ID_INTEL_ICH6_16
+#define PCI_DEVICE_ID_INTEL_ICH6_16	0x266a
 #endif
 
 #ifdef I2C_FUNC_SMBUS_BLOCK_DATA_PEC
@@ -138,9 +153,9 @@ static int i801_setup(struct pci_dev *dev)
 
 	I801_dev = dev;
 	if (dev->device == PCI_DEVICE_ID_INTEL_82801DB_3 ||
-	    dev->device == 0x24d3 ||
-	    dev->device == 0x25a4 ||
-	    dev->device == 0x266a ||
+	    dev->device == PCI_DEVICE_ID_INTEL_82801EB_3 ||
+	    dev->device == PCI_DEVICE_ID_INTEL_ESB_4 ||
+	    dev->device == PCI_DEVICE_ID_INTEL_ICH6_16 ||
 	    dev->device == 0x27da)
 		isich4 = 1;
 	else
@@ -624,19 +639,19 @@ static struct pci_device_id i801_ids[] __devinitdata = {
 	},
 	{
 		.vendor =	PCI_VENDOR_ID_INTEL,
-		.device =	0x24d3,	/* 82801EB ICH5 */
+		.device =	PCI_DEVICE_ID_INTEL_82801EB_3,
 		.subvendor =	PCI_ANY_ID,
 		.subdevice =	PCI_ANY_ID,
 	},
 	{
 		.vendor =	PCI_VENDOR_ID_INTEL,
-		.device =	0x25a4, /* PCI_DEVICE_ID_INTEL_ESB_4 */
+		.device =	PCI_DEVICE_ID_INTEL_ESB_4,
 		.subvendor =	PCI_ANY_ID,
 		.subdevice = 	PCI_ANY_ID,
 	},
 	{
 		.vendor =	PCI_VENDOR_ID_INTEL,
-		.device =	0x266a, /* PCI_DEVICE_ID_INTEL_ICH6_16 */
+		.device =	PCI_DEVICE_ID_INTEL_ICH6_16,
 		.subvendor =	PCI_ANY_ID,
 		.subdevice =	PCI_ANY_ID,
   	},