From 98e3f01378a31df476f2b853f351ebaec59ef3d7 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Thu, 6 Aug 2009 20:44:37 +0100
Subject: [PATCH] --- yaml --- r: 162354 b: refs/heads/master c:
 4dd00845690a6744dbd879fa49584c49098823d8 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/rar/rar_driver.c              | 8 +-------
 trunk/drivers/staging/sep/sep_ext_with_pci_driver.c | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 5d4a37b02747..84f83f42e20f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 137cf5b22f5fd38751265eae881749c311d27c75
+refs/heads/master: 4dd00845690a6744dbd879fa49584c49098823d8
diff --git a/trunk/drivers/staging/rar/rar_driver.c b/trunk/drivers/staging/rar/rar_driver.c
index 0428bce5d213..9805d74bd341 100644
--- a/trunk/drivers/staging/rar/rar_driver.c
+++ b/trunk/drivers/staging/rar/rar_driver.c
@@ -17,12 +17,6 @@
 #include <linux/sched.h>
 #include "rar_driver.h"
 
-/* PCI vendor id for controler */
-#define VENDOR_ID 0x8086
-
-/* PCI device id for controler */
-#define DEVICE_ID 0x4110
-
 /* The following defines are for the IPC process to retrieve RAR in */
 
 /* === Lincroft Message Bus Interface === */
@@ -77,7 +71,7 @@ static void __exit rar_exit_handler(void);
 static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 
 static struct pci_device_id rar_pci_id_tbl[] = {
-	{ PCI_DEVICE(VENDOR_ID, DEVICE_ID) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4110) },
 	{ 0 }
 };
 
diff --git a/trunk/drivers/staging/sep/sep_ext_with_pci_driver.c b/trunk/drivers/staging/sep/sep_ext_with_pci_driver.c
index 49465f23db6d..bac0dd0af855 100644
--- a/trunk/drivers/staging/sep/sep_ext_with_pci_driver.c
+++ b/trunk/drivers/staging/sep/sep_ext_with_pci_driver.c
@@ -91,8 +91,6 @@ static unsigned long CRYS_SEP_ROM[] = {
 
 irqreturn_t sep_inthandler(int irq , void* dev_id);
 
-/* NOTE - must be defined specific to the board */
-#define VENDOR_ID                             0x8086
 
 /* io memory (register area) */
 static unsigned long io_memory_start_physical_address;
@@ -134,7 +132,7 @@ static int __devinit sep_probe(struct pci_dev *pdev,
   const struct pci_device_id *ent);
 
 static struct pci_device_id sep_pci_id_tbl[] = {
-	{ PCI_DEVICE(VENDOR_ID, 0x080c) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080c) },
 	{ 0 }
 };