From b5ecf2d345a6234bc16b70df63744c1b84517d2c Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 25 Jul 2008 19:46:21 -0700
Subject: [PATCH] --- yaml --- r: 106250 b: refs/heads/master c:
 25cdcd0086d97a011fcd0c1ff572e30da24790ec h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/pnp/base.h | 1 -
 trunk/drivers/pnp/card.c | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c583ca2cf29..584ad9fae321 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96930a6365c99c160138a395566e360b27348b8f
+refs/heads/master: 25cdcd0086d97a011fcd0c1ff572e30da24790ec
diff --git a/trunk/drivers/pnp/base.h b/trunk/drivers/pnp/base.h
index e3fa9a2d9a3d..9fd7bb9b7dce 100644
--- a/trunk/drivers/pnp/base.h
+++ b/trunk/drivers/pnp/base.h
@@ -19,7 +19,6 @@ struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);
 int pnp_interface_attach_device(struct pnp_dev *dev);
 
 int pnp_add_card(struct pnp_card *card);
-struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id);
 void pnp_remove_card(struct pnp_card *card);
 int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev);
 void pnp_remove_card_device(struct pnp_dev *dev);
diff --git a/trunk/drivers/pnp/card.c b/trunk/drivers/pnp/card.c
index b00ef1030e45..e75b060daa95 100644
--- a/trunk/drivers/pnp/card.c
+++ b/trunk/drivers/pnp/card.c
@@ -102,7 +102,7 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv)
  * @id: pointer to a pnp_id structure
  * @card: pointer to the desired card
  */
-struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id)
+static struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id)
 {
 	struct pnp_id *dev_id, *ptr;