1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index a3040429c27b..3a26f9cc8585 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -275,20 +275,20 @@ static const struct cirrusfb_board_info_rec {
 
 #ifdef CONFIG_PCI
 #define CHIP(id, btype) \
-        { PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_##id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
+        { PCI_VENDOR_ID_CIRRUS, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
 
 static struct pci_device_id cirrusfb_pci_table[] = {
-        CHIP( CIRRUS_5436,      BT_ALPINE ),
-        CHIP( CIRRUS_5434_8,    BT_ALPINE ),
-        CHIP( CIRRUS_5434_4,    BT_ALPINE ),
-        CHIP( CIRRUS_5430,      BT_ALPINE ), /* GD-5440 has identical id */
-        CHIP( CIRRUS_7543,      BT_ALPINE ),
-        CHIP( CIRRUS_7548,      BT_ALPINE ),
-        CHIP( CIRRUS_5480,      BT_GD5480 ), /* MacPicasso probably */
-        CHIP( CIRRUS_5446,      BT_PICASSO4 ), /* Picasso 4 is a GD5446 */
-        CHIP( CIRRUS_5462,      BT_LAGUNA ), /* CL Laguna */
-        CHIP( CIRRUS_5464,      BT_LAGUNA ), /* CL Laguna 3D */
-        CHIP( CIRRUS_5465,      BT_LAGUNA ), /* CL Laguna 3DA*/
+        CHIP( PCI_DEVICE_ID_CIRRUS_5436, BT_ALPINE ),
+        CHIP( PCI_DEVICE_ID_CIRRUS_5434_8, BT_ALPINE ),
+        CHIP( PCI_DEVICE_ID_CIRRUS_5434_4, BT_ALPINE ),
+        CHIP( PCI_DEVICE_ID_CIRRUS_5430, BT_ALPINE ), /* GD-5440 is same id */
+        CHIP( PCI_DEVICE_ID_CIRRUS_7543, BT_ALPINE ),
+        CHIP( PCI_DEVICE_ID_CIRRUS_7548, BT_ALPINE ),
+        CHIP( PCI_DEVICE_ID_CIRRUS_5480, BT_GD5480 ), /* MacPicasso likely */
+        CHIP( PCI_DEVICE_ID_CIRRUS_5446, BT_PICASSO4 ), /* Picasso 4 is 5446 */
+        CHIP( PCI_DEVICE_ID_CIRRUS_5462, BT_LAGUNA ), /* CL Laguna */
+        CHIP( PCI_DEVICE_ID_CIRRUS_5464, BT_LAGUNA ), /* CL Laguna 3D */
+        CHIP( PCI_DEVICE_ID_CIRRUS_5465, BT_LAGUNA ), /* CL Laguna 3DA*/
         { 0, }
 };
 MODULE_DEVICE_TABLE(pci, cirrusfb_pci_table);