Pull release into acpica branch

2 files changed, 2 insertions, 11 deletions

diff --git a/drivers/input/joystick/amijoy.c b/drivers/input/joystick/amijoy.c
index 8558a99f6635..ec55a29fc861 100644
--- a/drivers/input/joystick/amijoy.c
+++ b/drivers/input/joystick/amijoy.c
@@ -64,8 +64,8 @@ static irqreturn_t amijoy_interrupt(int irq, void *dummy, struct pt_regs *fp)
                 if (amijoy[i]) {
 
                         switch (i) {
-                                case 0: data = ~custom.joy0dat; button = (~ciaa.pra >> 6) & 1; break;
-                                case 1: data = ~custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break;
+                                case 0: data = ~amiga_custom.joy0dat; button = (~ciaa.pra >> 6) & 1; break;
+                                case 1: data = ~amiga_custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break;
                         }
 
                         input_regs(amijoy_dev[i], fp);
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index 51a912222e85..62438944a69a 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -53,17 +53,8 @@ struct grip_port {
 struct grip_mp {
         struct gameport *gameport;
         struct grip_port *port[GRIP_MAX_PORTS];
-//      struct input_dev *dev[4];
-//      int mode[4];
-//      int registered[4];
         int reads;
         int bads;
-
-        /* individual gamepad states */
-//      int buttons[4];
-//      int xaxes[4];
-//      int yaxes[4];
-//      int dirty[4];     /* has the state been updated? */
 };
 
 /*