Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pcmcia/ds.c

Fix up merge failures with Linus's head and fix new compile failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 1 insertions, 19 deletions

diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 3b29086b7c3f..92648ef2f5d0 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -644,22 +644,7 @@ static int btuart_config(struct pcmcia_device *link)
         u_short buf[256];
         cisparse_t parse;
         cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-        int i, j, try, last_ret, last_fn;
-
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleOffset = 0;
-        tuple.TupleDataMax = 255;
-        tuple.Attributes = 0;
-
-        /* Get configuration register information */
-        tuple.DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(link, &tuple, &parse);
-        if (last_ret != CS_SUCCESS) {
-                last_fn = ParseTuple;
-                goto cs_failed;
-        }
-        link->conf.ConfigBase = parse.config.base;
-        link->conf.Present = parse.config.rmask[0];
+        int i, j, try;
 
         /* First pass: look for a config entry that looks normal. */
         tuple.TupleData = (cisdata_t *) buf;
@@ -734,9 +719,6 @@ found_port:
 
         return 0;
 
-cs_failed:
-        cs_error(link, last_fn, last_ret);
-
 failed:
         btuart_release(link);
         return -ENODEV;