diff --git a/[refs] b/[refs]
index 520b23b55a76..c06c257fbd78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c22db439a29358bac90d553d273c3023d64e38b
+refs/heads/master: dcbc2fc62cb60a76161fb08737ea7165e05da111
diff --git a/trunk/drivers/staging/phison/phison.c b/trunk/drivers/staging/phison/phison.c
index 683657cb21f5..d77b21f1eb2d 100644
--- a/trunk/drivers/staging/phison/phison.c
+++ b/trunk/drivers/staging/phison/phison.c
@@ -70,7 +70,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 }
 
 static DEFINE_PCI_DEVICE_TABLE(phison_pci_tbl) = {
-	{ PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000, PCI_ANY_ID, PCI_ANY_ID,
+	{ PCI_DEVICE(PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000),
 	  PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
 	{ 0, },
 };