From 9b2c30caa9bfceeb88624c41800be8c6fbcd84f5 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 3 May 2011 19:29:00 -0700
Subject: [PATCH] --- yaml --- r: 250735 b: refs/heads/master c:
 e9fb13bfec7e017130ddc5c1b5466340470f4900 h: refs/heads/master i:   250733:
 9f837133b1f1feecb70fb5c763325d3f95bb38b8   250731:
 2d3e3e24867f63cbde879b13ecb1e425b7d2721a   250727:
 62eb66cf95442187598daba857f444fb26838ad5   250719:
 d294856f45fba687444390c773c075ae022c0371 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pcmcia/ds.c | 6 +++---
 trunk/include/pcmcia/ds.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a8bbfaeb678f..08ce4f0aa480 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37fac4b6e6fde4ea4f5fd76948ba6f3e5dc63c01
+refs/heads/master: e9fb13bfec7e017130ddc5c1b5466340470f4900
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
index 100c4412457d..749c2a16012c 100644
--- a/trunk/drivers/pcmcia/ds.c
+++ b/trunk/drivers/pcmcia/ds.c
@@ -45,7 +45,7 @@ MODULE_LICENSE("GPL");
 
 static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
 {
-	struct pcmcia_device_id *did = p_drv->id_table;
+	const struct pcmcia_device_id *did = p_drv->id_table;
 	unsigned int i;
 	u32 hash;
 
@@ -784,7 +784,7 @@ static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filenam
 
 
 static inline int pcmcia_devmatch(struct pcmcia_device *dev,
-				  struct pcmcia_device_id *did)
+				  const struct pcmcia_device_id *did)
 {
 	if (did->match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID) {
 		if ((!dev->has_manf_id) || (dev->manf_id != did->manf_id))
@@ -890,7 +890,7 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
 {
 	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
 	struct pcmcia_driver *p_drv = to_pcmcia_drv(drv);
-	struct pcmcia_device_id *did = p_drv->id_table;
+	const struct pcmcia_device_id *did = p_drv->id_table;
 	struct pcmcia_dynid *dynid;
 
 	/* match dynamic devices first */
diff --git a/trunk/include/pcmcia/ds.h b/trunk/include/pcmcia/ds.h
index 3fd5064dd43a..7b82080eb02c 100644
--- a/trunk/include/pcmcia/ds.h
+++ b/trunk/include/pcmcia/ds.h
@@ -56,7 +56,7 @@ struct pcmcia_driver {
 	int (*resume)		(struct pcmcia_device *dev);
 
 	struct module		*owner;
-	struct pcmcia_device_id	*id_table;
+	const struct pcmcia_device_id	*id_table;
 	struct device_driver	drv;
 	struct pcmcia_dynids	dynids;
 };