Automerge

diff --cc drivers/pnp/interface.c
index e33e5617819cd00b7a01cb8917a1dd052aa30ba2,98ade1763fa657d51ed0fd9bebebd1c954412452..498a77b6a389680471e404bf603540c3be2f605c
--- 1/drivers/pnp/interface.c
--- 2/drivers/pnp/interface.c
+++ b/drivers/pnp/interface.c
@@@ -284,12 -286,12 +284,11 @@@ pnp_set_current_resources(struct devic
  {
        struct pnp_dev *dev = to_pnp_dev(dmdev);
        char    command[20];
-       char    type[20];
        int     num_args;
        int     error = 0;
-       int     depnum, mode = 0;
+       int     depnum;
 -      if (off)
 -              return 0;
 +
-       num_args = sscanf(buf,"%10s %i %10s",command,&depnum,type);
+       num_args = sscanf(buf,"%10s %i",command,&depnum);
        if (!num_args)
                goto done;
        if (!strnicmp(command,"lock",4)) {