diff --git a/[refs] b/[refs]
index 0ee65ede1988..a2634e19a453 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 811f999160487c586917937e95506cb8528472a3
+refs/heads/master: bb5dc36644975ca5237a415fb63f59f9803d84fa
diff --git a/trunk/drivers/char/watchdog/i6300esb.c b/trunk/drivers/char/watchdog/i6300esb.c
index 823924e4249b..575d6cd9e59a 100644
--- a/trunk/drivers/char/watchdog/i6300esb.c
+++ b/trunk/drivers/char/watchdog/i6300esb.c
@@ -345,7 +345,7 @@ static struct notifier_block esb_notifier = {
  * want to register another driver on the same PCI id.
  */
 static struct pci_device_id esb_pci_tbl[] = {
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9, PCI_ANY_ID, PCI_ANY_ID, },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), },
         { 0, },                 /* End of list */
 };
 MODULE_DEVICE_TABLE (pci, esb_pci_tbl);
@@ -365,7 +365,7 @@ static unsigned char __init esb_getdevice (void)
          */
 
         for_each_pci_dev(dev) {
-                if (pci_match_device(esb_pci_tbl, dev)) {
+                if (pci_match_id(esb_pci_tbl, dev)) {
                         esb_pci = dev;
                         break;
                 }