xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] m68k: namespace pollution fix (custom->amiga_custom)

Browse Source 
in amigahw.h custom renamed to amiga_custom, in drivers with few instances the
same replacement, in the rest - #define custom amiga_custom in driver itself

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2006-01-12 01:06:12 -08:00
committed by Linus Torvalds
parent 198a410119
commit b4290a23cf
22 changed files with 108 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/joystick/amijoy.c
View File

@@ -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);