Merge branch 'master' into upstream

Conflicts:

	drivers/net/netxen/netxen_nic.h
	drivers/net/netxen/netxen_nic_main.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index d6164cd583fd..f573ea04db6f 100644
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -135,7 +135,7 @@ int pccard_get_status(struct pcmcia_socket *s, struct pcmcia_device *p_dev, cs_s
 struct pcmcia_callback{
         struct module   *owner;
         int             (*event) (struct pcmcia_socket *s, event_t event, int priority);
-        void            (*requery) (struct pcmcia_socket *s);
+        void            (*requery) (struct pcmcia_socket *s, int new_cis);
         int             (*suspend) (struct pcmcia_socket *s);
         int             (*resume) (struct pcmcia_socket *s);
 };