From 7c982fa4059dddcd66d029d958382d1bece28096 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 8 Feb 2010 10:07:15 +0000
Subject: [PATCH] --- yaml --- r: 185202 b: refs/heads/master c:
 b2a3dbc3ed401828c4de0f08d08d96d0f5ea5b0b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/nozomi.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5cf6ec320c40..1e821a473e66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8c65d143a9903cb553c0d80c819428c5b839a02
+refs/heads/master: b2a3dbc3ed401828c4de0f08d08d96d0f5ea5b0b
diff --git a/trunk/drivers/char/nozomi.c b/trunk/drivers/char/nozomi.c
index fac9157a0ec0..584910ff725e 100644
--- a/trunk/drivers/char/nozomi.c
+++ b/trunk/drivers/char/nozomi.c
@@ -136,10 +136,6 @@ static int debug;
 #define RECEIVE_BUF_MAX		4
 
 
-/* Define all types of vendors and devices to support */
-#define VENDOR1		0x1931	/* Vendor Option */
-#define DEVICE1		0x000c	/* HSDPA card */
-
 #define R_IIR		0x0000	/* Interrupt Identity Register */
 #define R_FCR		0x0000	/* Flow Control Register */
 #define R_IER		0x0004	/* Interrupt Enable Register */
@@ -407,7 +403,7 @@ struct buffer {
 
 /*    Global variables */
 static const struct pci_device_id nozomi_pci_tbl[] __devinitconst = {
-	{PCI_DEVICE(VENDOR1, DEVICE1)},
+	{PCI_DEVICE(0x1931, 0x000c)},	/* Nozomi HSDPA */
 	{},
 };