diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/joystick/amijoy.c | 4 | ||||
-rw-r--r-- | drivers/input/mouse/amimouse.c | 6 |
2 files changed, 5 insertions, 5 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) | |||
64 | if (amijoy[i]) { | 64 | if (amijoy[i]) { |
65 | 65 | ||
66 | switch (i) { | 66 | switch (i) { |
67 | case 0: data = ~custom.joy0dat; button = (~ciaa.pra >> 6) & 1; break; | 67 | case 0: data = ~amiga_custom.joy0dat; button = (~ciaa.pra >> 6) & 1; break; |
68 | case 1: data = ~custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break; | 68 | case 1: data = ~amiga_custom.joy1dat; button = (~ciaa.pra >> 7) & 1; break; |
69 | } | 69 | } |
70 | 70 | ||
71 | input_regs(amijoy_dev[i], fp); | 71 | input_regs(amijoy_dev[i], fp); |
diff --git a/drivers/input/mouse/amimouse.c b/drivers/input/mouse/amimouse.c index d13d4c8fe3c5..c8b2cc9f184c 100644 --- a/drivers/input/mouse/amimouse.c +++ b/drivers/input/mouse/amimouse.c | |||
@@ -41,7 +41,7 @@ static irqreturn_t amimouse_interrupt(int irq, void *dummy, struct pt_regs *fp) | |||
41 | unsigned short joy0dat, potgor; | 41 | unsigned short joy0dat, potgor; |
42 | int nx, ny, dx, dy; | 42 | int nx, ny, dx, dy; |
43 | 43 | ||
44 | joy0dat = custom.joy0dat; | 44 | joy0dat = amiga_custom.joy0dat; |
45 | 45 | ||
46 | nx = joy0dat & 0xff; | 46 | nx = joy0dat & 0xff; |
47 | ny = joy0dat >> 8; | 47 | ny = joy0dat >> 8; |
@@ -57,7 +57,7 @@ static irqreturn_t amimouse_interrupt(int irq, void *dummy, struct pt_regs *fp) | |||
57 | amimouse_lastx = nx; | 57 | amimouse_lastx = nx; |
58 | amimouse_lasty = ny; | 58 | amimouse_lasty = ny; |
59 | 59 | ||
60 | potgor = custom.potgor; | 60 | potgor = amiga_custom.potgor; |
61 | 61 | ||
62 | input_regs(amimouse_dev, fp); | 62 | input_regs(amimouse_dev, fp); |
63 | 63 | ||
@@ -77,7 +77,7 @@ static int amimouse_open(struct input_dev *dev) | |||
77 | { | 77 | { |
78 | unsigned short joy0dat; | 78 | unsigned short joy0dat; |
79 | 79 | ||
80 | joy0dat = custom.joy0dat; | 80 | joy0dat = amiga_custom.joy0dat; |
81 | 81 | ||
82 | amimouse_lastx = joy0dat & 0xff; | 82 | amimouse_lastx = joy0dat & 0xff; |
83 | amimouse_lasty = joy0dat >> 8; | 83 | amimouse_lasty = joy0dat >> 8; |